Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJef van Schendel <mail@jefvanschendel.nl>
Mon, 5 Mar 2012 23:36:15 +0000 (00:36 +0100)
committerJef van Schendel <mail@jefvanschendel.nl>
Mon, 5 Mar 2012 23:36:15 +0000 (00:36 +0100)
commit3d541b04a9c5fe5729ce1b4386a2964b2730484d
tree8bbb87bef4e4ff3df35f2bc492f038328fed459e
parentb01a3b938666569cc021698ce854fb534e4d85e3
parentb62b3b982a2543fb881c93570c544fbef61dd97e
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin