Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 24 Jul 2011 19:56:39 +0000 (14:56 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 24 Jul 2011 19:56:39 +0000 (14:56 -0500)
commit73da11e759913109e481c2b20c51c9f72e45be14
tree406d4ddc6bdccf4fde6b66a28869f3a5130ba4e6
parent5fa3588411f402d9ec1dfb3123e9d828c3ce9753
parent0a80ad41a92840f80b306acfb45649eab3f34ae1
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin