Merge remote-tracking branch 'spechards-mediagoblin/master'
authorBoris Bobrov <breton@cynicmansion.ru>
Sun, 29 Jan 2017 16:09:06 +0000 (19:09 +0300)
committerBoris Bobrov <breton@cynicmansion.ru>
Sun, 29 Jan 2017 16:09:06 +0000 (19:09 +0300)
commitf86dafe2a01e64183e54d4a98eccb01d007c68e6
treeb0820ed282615c8b87297e198ce4b141c869a84a
parentd26ea3f3bcb4543f6e3eefb507d278fc4d068b4e
parente119aed22900b682c7dd2cce979f694282f5dbe5
Merge remote-tracking branch 'spechards-mediagoblin/master'

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

Fixes issue #915
docs/source/siteadmin/commandline-upload.rst
mediagoblin/gmg_commands/addmedia.py
mediagoblin/submit/lib.py