Merge remote-tracking branch 'refs/remotes/brandoninvergo/pyconfigure' into merge...
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 25 Jul 2013 19:29:30 +0000 (14:29 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 25 Jul 2013 19:29:30 +0000 (14:29 -0500)
1  2 
setup.py.in

diff --cc setup.py.in
Simple merge