Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 10 Apr 2011 20:04:21 +0000 (15:04 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 10 Apr 2011 20:04:21 +0000 (15:04 -0500)
commite579cf544da9f4e44078377ecdff782c8c2cbf29
treec68e83f8fd07a12d29c32cb4bf8940f4c1287fbf
parent644614d4dd73b171d069f73dba84b5c081eb6961
parent8736b05d051dc5f2777dc4f86e684e3a3cec6a7c
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin