Merge branch 'refs/heads/develop' into tv

Conflicts: couchpotato/core/media/movie/_base/main.py couchpotato/core/plugins/release/main.py couchpotato/core/plugins/renamer/main.py
2013-11-30 12:44:13 +01:00
parent a989c93505 2fc4809821
commit efdf77ef6c
33 changed files with 1047 additions and 464 deletions
@@ -20,7 +20,7 @@ config = [{
                },
                {
                    'name': 'languages',
-                    'description': 'Comma separated, 2 letter country code. Example: en, nl. See the codes at <a href="http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes">on Wikipedia</a>',
+                    'description': ('Comma separated, 2 letter country code.', 'Example: en, nl. See the codes at <a href="http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes">on Wikipedia</a>'),
                },
 #                {
 #                    'name': 'automatic',