Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi Mittal <aditi.iitr@gmail.com>
Sat, 31 Aug 2013 07:04:02 +0000 (12:34 +0530)
committerAditi Mittal <aditi.iitr@gmail.com>
Sat, 31 Aug 2013 07:04:02 +0000 (12:34 +0530)
commita7f02e9514ca9256412d138c9bba89b299431efa
tree351079460e45f2ee50fbdb363473f5708857171c
parentdc56835a79d8b77fd90064711ca745583f38a111
parent6b61a51e4527379a26b2c5cfd892dd351bce62bb
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin