Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Thu, 29 Mar 2012 21:01:40 +0000 (23:01 +0200)
committerJoar Wandborg <git@wandborg.com>
Thu, 29 Mar 2012 21:01:40 +0000 (23:01 +0200)
commit450ea6094d516454429dd27cd07b3799a895f78e
tree0ee27aceb35f41817a60de7bca5c2d15fbf009e2
parentff3136d0e8179a91591b75b8955dd886a1a1b1d9
parentc45dfee61e9b781c391903d4e215507821857769
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin