Merge remote-tracking branch 'spechards-mediagoblin/master'

Conflicts:
	mediagoblin/submit/lib.py -- happened because of creator->actor
                                     change

Fixes issue #915

mediagoblin/gmg_commands/addmedia.py

@@ -56,6 +56,11 @@ def parser_setup(subparser):
         help=(
             "Slug for this media entry. "
             "Will be autogenerated if unspecified."))
+    subparser.add_argument(
+        "-c", "--collection-slug",
+        help=(
+            "Slug of the collection for this media entry."
+            "Should already exits."))
 
     subparser.add_argument(
         '--celery',
@@ -100,6 +105,7 @@ def addmedia(args):
             submitted_file=open(abs_filename, 'rb'), filename=filename,
             title=maybe_unicodeify(args.title),
             description=maybe_unicodeify(args.description),
+            collection_slug=args.collection_slug,
             license=maybe_unicodeify(args.license),
             tags_string=maybe_unicodeify(args.tags) or u"")
     except FileUploadLimit: