Merge remote branch 'remotes/elrond/idea/globals_check'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 19 Jun 2011 21:22:41 +0000 (16:22 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 19 Jun 2011 21:22:41 +0000 (16:22 -0500)
commitd802498a2c6dce27af602f8b0affad376a219191
tree2094935c734b188bb856efde529e4b78ab6bab6b
parent668e8c26ad61b0ff1ee1beeb81d729934dd298f7
parent49285baf2755e4cead741dd5c615a65736a5dc08
Merge remote branch 'remotes/elrond/idea/globals_check'

Conflicts:
mediagoblin/tests/test_globals.py
mediagoblin/mg_globals.py
mediagoblin/tests/test_globals.py