Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJef van Schendel <mail@jefvanschendel.nl>
Sun, 25 Mar 2012 19:34:00 +0000 (21:34 +0200)
committerJef van Schendel <mail@jefvanschendel.nl>
Sun, 25 Mar 2012 19:34:00 +0000 (21:34 +0200)
commit7ccf41818581743c2e16935cd7308ad3d6694149
treef49b8fdaf5bdf02532a0d7f9032554bda26db304
parentafcb08553edb682788a9c713cba06196c1e48297
parent0608d57f5d2b92170649faa37a39ea326e130dfa
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin