Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi <aditi.iitr@gmail.com>
Wed, 26 Jun 2013 16:43:23 +0000 (22:13 +0530)
committerAditi <aditi.iitr@gmail.com>
Wed, 26 Jun 2013 16:43:23 +0000 (22:13 +0530)

Trivial merge