Merge branch 'master' into configobj
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 18 Jun 2011 16:10:46 +0000 (11:10 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 18 Jun 2011 16:10:46 +0000 (11:10 -0500)
commitc897283849abbe7f7e6506c2c3b179ff0fd3f9d2
treed545dc3fe7a3a2c2c9cadab630d815c47776e54a
parente2c6436e3e7c654a8d4196ac378debf185c74fa4
parent5a994e37c2947d20e3aedfb78f9d6194dd59d506
Merge branch 'master' into configobj

Conflicts:
setup.py
setup.py