Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJef van Schendel <mail@jefvanschendel.nl>
Wed, 4 Jan 2012 23:17:51 +0000 (00:17 +0100)
committerJef van Schendel <mail@jefvanschendel.nl>
Wed, 4 Jan 2012 23:17:51 +0000 (00:17 +0100)
commita473deda9ab5ae3b12d386cafba70347a53b5136
treeb70e11e40d0b10d2daa2995e6365ded8498bd8dc
parentc8071fa591ad148fbffdabc4d6dd71f5666c2172
parentf1cdd278e7cf195e485567ed0d0d8a90cad81e48
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin