Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi <aditi.iitr@gmail.com>
Mon, 29 Jul 2013 08:01:35 +0000 (13:31 +0530)
committerAditi <aditi.iitr@gmail.com>
Mon, 29 Jul 2013 08:01:35 +0000 (13:31 +0530)
commit72514eb27283aa71c3a718b9142e695c07ecdfcf
treed4e65ed5c78d30dfb8d3340de0ad749a07104985
parent221cde571104ae4b7f5c6d47a2ddd21dc9550149
parent9a2b36c9a2671938f37c642c2414f5a11b7e74f4
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

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