Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi <aditi.iitr@gmail.com>
Sun, 4 Aug 2013 16:31:21 +0000 (22:01 +0530)
committerAditi <aditi.iitr@gmail.com>
Sun, 4 Aug 2013 16:31:21 +0000 (22:01 +0530)
commita857954148c00e45f3cf2564940906baf4ebecc8
tree32df5d22c3ba4c48fcdf4bc6043fad3dbf62c06d
parentec85d24dfefd3544e23b88c3f1bcb32dfed09215
parent31de493e4136f1c0c8e9d8f0b82c2914ea990c15
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin