Merge branch 'metadata' of gitorious.org:mediagoblin/npigeons-mediagoblin into metadata
authortilly-Q <nattilypigeonfowl@gmail.com>
Mon, 21 Apr 2014 16:17:39 +0000 (12:17 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Mon, 21 Apr 2014 16:17:39 +0000 (12:17 -0400)
commit77a19712c390e5f7b2beb09314f8b4f2c2eaa794
treef7ba1818c021811984cb5aafcfd9141aa77e8d3a
parent45f426ddee9900439c086a8bb3d1cfaedf3eca6f
parent89b6b55766f71466ec001398b2537569543dc175
Merge branch 'metadata' of gitorious.org:mediagoblin/npigeons-mediagoblin into metadata

Conflicts:
mediagoblin/gmg_commands/batchaddmedia.py
setup.py
setup.py