Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Thu, 29 Mar 2012 14:19:11 +0000 (16:19 +0200)
committerJoar Wandborg <git@wandborg.com>
Thu, 29 Mar 2012 14:19:11 +0000 (16:19 +0200)
commit90b25eb2d1563ca945c18151738196d5305568fb
tree679d001825f1ec214e9b2bd165574671de33fa8e
parent97e40b52854a4177ac5da62ca567d4003867e08b
parent582958e333e9624654d57fb9e17d3340b5d0ac9b
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin