Merge pull request #342 from FiloSottile/master
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 22 May 2012 11:35:59 +0000 (04:35 -0700)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 22 May 2012 11:35:59 +0000 (04:35 -0700)
Re-organized code and a lot of other stuff.


Trivial merge