Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorxray7224 <xray7224@googlemail.com>
Sun, 14 Jul 2013 16:31:03 +0000 (17:31 +0100)
committerxray7224 <xray7224@googlemail.com>
Sun, 14 Jul 2013 16:31:03 +0000 (17:31 +0100)
commit670717d950c4bb5ef908c23e46df4016b5dc2bd2
tree0f7a9c2470ef983a694f9d72f50b4ae2bda2440b
parentcfe7054c13880657fdcb95068a734554ff847cea
parentdf206ab633ef369c89d27321823daf140a5ff6f4
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin