Merge remote-tracking branch 'refs/remotes/pythonsnake/581_config'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 24 Feb 2013 19:52:13 +0000 (13:52 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 24 Feb 2013 19:52:13 +0000 (13:52 -0600)
commit203f51a8662f681eb0edc71d75e930d778b51df5
tree42dcd90aa3ea39daff2e1e88ce69a292bd5b35ea
parenta587492729f2329e63144174513e705454c9e4dd
parentdc000b70ffe6b891544d6e330078ff6f80e013d3
Merge remote-tracking branch 'refs/remotes/pythonsnake/581_config'