Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi <aditi.iitr@gmail.com>
Mon, 29 Jul 2013 08:01:35 +0000 (13:31 +0530)
committerAditi <aditi.iitr@gmail.com>
Mon, 29 Jul 2013 08:01:35 +0000 (13:31 +0530)
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin


Trivial merge