diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 16:22:41 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 16:22:41 -0500 |
| commit | d802498a2c6dce27af602f8b0affad376a219191 (patch) | |
| tree | 2094935c734b188bb856efde529e4b78ab6bab6b /setup.py | |
| parent | 668e8c26ad61b0ff1ee1beeb81d729934dd298f7 (diff) | |
| parent | 49285baf2755e4cead741dd5c615a65736a5dc08 (diff) | |
| download | mediagoblin-d802498a2c6dce27af602f8b0affad376a219191.tar.lz mediagoblin-d802498a2c6dce27af602f8b0affad376a219191.tar.xz mediagoblin-d802498a2c6dce27af602f8b0affad376a219191.zip | |
Merge remote branch 'remotes/elrond/idea/globals_check'
Conflicts:
mediagoblin/tests/test_globals.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions