Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi Mittal <aditi.iitr@gmail.com>
Sat, 31 Aug 2013 07:04:02 +0000 (12:34 +0530)
committerAditi Mittal <aditi.iitr@gmail.com>
Sat, 31 Aug 2013 07:04:02 +0000 (12:34 +0530)

Trivial merge