Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi <aditi.iitr@gmail.com>
Wed, 31 Jul 2013 13:45:20 +0000 (19:15 +0530)
committerAditi <aditi.iitr@gmail.com>
Wed, 31 Jul 2013 13:45:20 +0000 (19:15 +0530)
commitaf2f28033be564af0609cfac54c9ae3dbe2cdb42
tree252bb7d5da4f0b8fd3a3adb208322d21d85e0a78
parentef010b6453d1a4152abe6869b0b019ee1fb3dc6b
parenta1e299d60e135905e39358fe5dc1efcd64172daf
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin