Sebastian Spaeth a42dda21f9 Merge branch 'master' into upstream-master
Conflicts:
	mediagoblin/templates/mediagoblin/base.html
	mediagoblin/templates/mediagoblin/user_pages/user.html
2013-12-12 16:24:34 +01:00
..
2011-08-20 21:22:51 +02:00
2012-03-01 17:30:07 -06:00
2012-03-01 17:30:07 -06:00
2011-11-01 23:55:19 -05:00
2012-07-20 21:06:41 +02:00