Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorBrandon Invergo <brandon@invergo.net>
Sun, 19 May 2013 11:23:17 +0000 (13:23 +0200)
committerBrandon Invergo <brandon@invergo.net>
Sun, 19 May 2013 11:23:17 +0000 (13:23 +0200)
commite02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88
tree988b9505a649f824f2ea53ac04bdfbc3a0da983a
parent60c42337ef7bc9b4aec0d3f1b2cb5f19a09d9a7f
parent041d2fd785f9b3e18f9fd758f91dbfa7715d317c
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin