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)
commitab7b83dbc8c60cb74fd518dba42f3d4aea30a7db
treeeba3cb828c64aa88a25ea22b35671f20a961462c
parent06aca6af7368dc3d59e37ec2f0c731d4df756ae8
parentb889f97156ecb9dc1d72cd8d52a21245e0d28834
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin