Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi <aditi.iitr@gmail.com>
Wed, 24 Jul 2013 05:02:20 +0000 (10:32 +0530)
committerAditi <aditi.iitr@gmail.com>
Wed, 24 Jul 2013 05:02:20 +0000 (10:32 +0530)
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin


Trivial merge