Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

author xray7224 <xray7224@googlemail.com>

Sun, 14 Jul 2013 14:27:52 +0000 (15:27 +0100)

committer xray7224 <xray7224@googlemail.com>

Sun, 14 Jul 2013 14:27:52 +0000 (15:27 +0100)
author xray7224 <xray7224@googlemail.com>
Sun, 14 Jul 2013 14:27:52 +0000 (15:27 +0100)
committer xray7224 <xray7224@googlemail.com>
Sun, 14 Jul 2013 14:27:52 +0000 (15:27 +0100)
diff --cc mediagoblin/decorators.py
Simple merge
diff --cc mediagoblin/static/css/base.css
Simple merge
author	xray7224 <xray7224@googlemail.com>
	Sun, 14 Jul 2013 14:27:52 +0000 (15:27 +0100)
committer	xray7224 <xray7224@googlemail.com>
	Sun, 14 Jul 2013 14:27:52 +0000 (15:27 +0100)
		1	2
mediagoblin/decorators.py	patch \|	diff1 \|	diff2 \|	blob \| history
mediagoblin/static/css/base.css	patch \|	diff1 \|	diff2 \|	blob \| history