Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 1 Dec 2011 22:59:22 +0000 (16:59 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 1 Dec 2011 22:59:22 +0000 (16:59 -0600)
commit8e2af2843f2de273f75cc1351bb87a905a11fb92
treec074b1fc692e50c95c2f44fad345cccf58823adc
parentc7e1fee1b8eab3c01266c9a349812db598ca8f07
parent72567762e36c849ffe8172b6cea4ca1be682e511
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin