Merge branch 'permission_scheme' of gitorious.org:mediagoblin/npigeons-mediagoblin...
authortilly-Q <nattilypigeonfowl@gmail.com>
Thu, 1 May 2014 18:28:11 +0000 (14:28 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Thu, 1 May 2014 18:28:11 +0000 (14:28 -0400)
commit79a97f6bc370a2053d9335f0a635ff55a7a023a3
treee71a6d969babed6bfcd94ebc23cb9994291c03e6
parentce26346a4c17a6e0b81ddd12046f67c4beaa8143
parent0a5981fd5416c60858c3e460f943692d1c62629d
Merge branch 'permission_scheme' of gitorious.org:mediagoblin/npigeons-mediagoblin into permission_scheme

Conflicts:
mediagoblin.ini
mediagoblin/auth/tools.py
mediagoblin/config_spec.ini