Merge branch 'i507_beaker_cache'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 6 Sep 2011 04:28:41 +0000 (23:28 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 6 Sep 2011 04:28:41 +0000 (23:28 -0500)
commit273227e3999d43efe81f1e19f6d40c582c5cec86
tree8328ed7ec8c87a691eebf76a66a5bc379d8892b7
parent9a64272e483ef1e3a5ee8b10555822a3ea158053
parentfc21a55c76e9786f8ea8fdf504861c48e179a841
Merge branch 'i507_beaker_cache'
mediagoblin/app.py
mediagoblin/config_spec.ini
mediagoblin/init/__init__.py
mediagoblin/mg_globals.py