Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi <aditi.iitr@gmail.com>
Sun, 30 Jun 2013 14:19:53 +0000 (19:49 +0530)
committerAditi <aditi.iitr@gmail.com>
Sun, 30 Jun 2013 14:19:53 +0000 (19:49 +0530)
commitc5b7f89711cd3660bf01103b7bc186465d2064a7
tree22f60b3e5e60b3c4e57df3a639cdb7ca915c6065
parentc8a26376371b067dfd8a2357cb13ab4d368ea3cc
parente9f3306627c106d6b3848deceb00cc321465b627
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

"Merge with cweb/master."