Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi <aditi.iitr@gmail.com>
Wed, 26 Jun 2013 16:43:23 +0000 (22:13 +0530)
committerAditi <aditi.iitr@gmail.com>
Wed, 26 Jun 2013 16:43:23 +0000 (22:13 +0530)
commit054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd
treeb8890b62d50cfc20a7d9af7d86d6ceb0a29eb5fd
parent2719d546a57c2332e36cc056ac80ec5d79672c1a
parent491f2007f5d1f5f595c37491b7f9c0c2b4c93963
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin