Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJef van Schendel <mail@jefvanschendel.nl>
Sun, 24 Feb 2013 19:54:10 +0000 (20:54 +0100)
committerJef van Schendel <mail@jefvanschendel.nl>
Sun, 24 Feb 2013 19:54:10 +0000 (20:54 +0100)
commit42a8de4932df3e2de4c2e1e49ee72bb5af44c263
tree340426bb22a44baf8847c028265f9c3957679d60
parentfe253e31b33b82e2c6a6d17955945f698a59221d
parent76b399a3ef5ca844c0c6d1f288cf6f0030603093
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin