Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi Mittal <aditi.iitr@gmail.com>
Mon, 9 Sep 2013 16:23:56 +0000 (21:53 +0530)
committerAditi Mittal <aditi.iitr@gmail.com>
Mon, 9 Sep 2013 16:23:56 +0000 (21:53 +0530)
1  2 
mediagoblin/processing/__init__.py

Simple merge