Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi <aditi.iitr@gmail.com>
Sun, 30 Jun 2013 14:19:53 +0000 (19:49 +0530)
committerAditi <aditi.iitr@gmail.com>
Sun, 30 Jun 2013 14:19:53 +0000 (19:49 +0530)
"Merge with cweb/master."


Trivial merge