Merge branch 'master' into upstream-master
authorSebastian Spaeth <Sebastian@SSpaeth.de>
Thu, 12 Dec 2013 15:24:34 +0000 (16:24 +0100)
committerSebastian Spaeth <Sebastian@SSpaeth.de>
Thu, 12 Dec 2013 15:24:34 +0000 (16:24 +0100)
commita42dda21f96f5124d97011c318f068b92a4222b0
tree13edbe92814c93a4b7cd01ff4ff1af779f3706a7
parent070bc99c1eaecb6b8ca3d5f5a38942491bb1ef37
parentafff1492f89822d6c36fcad8b74953db2375cebf
Merge branch 'master' into upstream-master

Conflicts:
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/user_pages/user.html
mediagoblin.ini
mediagoblin/processing/__init__.py
mediagoblin/routing.py
mediagoblin/static/css/base.css
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/user_pages/user.html
mediagoblin/user_pages/views.py