Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 2 Apr 2011 15:49:16 +0000 (10:49 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 2 Apr 2011 15:49:16 +0000 (10:49 -0500)
commit80873214d6939b7355c9a5fdadbb8a35bf457594
tree4ee1901bbb08bf7dc89106acd849750a57449f4b
parent4b5f4e8791064a154963a28e2614a2ce95eafc12
parentf7294dd96138b26830888d0b77d8de8ad6d1a320
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin