Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJef van Schendel <mail@jefvanschendel.nl>
Sun, 21 Oct 2012 00:17:57 +0000 (02:17 +0200)
committerJef van Schendel <mail@jefvanschendel.nl>
Sun, 21 Oct 2012 00:17:57 +0000 (02:17 +0200)
commitd329882503950eb0b758a6b58b0fa3e6c1eb96e3
tree1f512adec8d12c05965daf337cc41a40415bec00
parentc40cb686de2c5ea242af81ac749d9239ac6a2dab
parentac4c5aef5775d5c4a3d8ebd5528e6d2db8062174
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin