Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 14 Jun 2011 02:02:16 +0000 (21:02 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 14 Jun 2011 02:02:16 +0000 (21:02 -0500)
commit3fd659e0eb89f56b696d96b4b7aed89aacdfba4c
tree0d07ef125433d848e2dfa7b83ca195b14297cfc3
parenta68ee5556e2cf78abd1e87546f8627ec07c1f89d
parent6729d65a3246208b658a3780c7fd62e20c666aa0
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin