Mark McDowall 65f2dbce77 Merge branch 'master' into backbone ... Conflicts: NzbDrone.Web/Global.asax.cs		2012-11-13 17:20:50 -08:00
..
Converting
Core
DecisionEngine
DownloadClients
ExternalNotification
Indexer
Metadata
Xbmc
AutoConfigureProvider.cs
BackupProvider.cs
BannerProvider.cs
DiskScanProvider.cs
DownloadProvider.cs
EpisodeProvider.cs
ExternalNotificationProvider.cs
GrowlProvider.cs
HistoryProvider.cs
IndexerProvider.cs
MediaFileProvider.cs
MetadataProvider.cs
MisnamedProvider.cs
NewznabProvider.cs
NotificationProvider.cs
PlexProvider.cs
PostDownloadProvider.cs
ProwlProvider.cs
QualityProvider.cs
QualityTypeProvider.cs
RecycleBinProvider.cs
ReferenceDataProvider.cs
RootDirProvider.cs
SceneMappingProvider.cs
SearchHistoryProvider.cs
SearchProvider.cs
SeasonProvider.cs
SeriesProvider.cs
SignalRProvider.cs
SmtpProvider.cs
StatsProvider.cs
TvDbProvider.cs
TwitterProvider.cs
UpcomingEpisodesProvider.cs
UpdateProvider.cs
XbmcProvider.cs
XemCommunicationProvider.cs
XemProvider.cs