Merge pull request #635 from johan/patch-1
authorNico Weber <nicolasweber@gmx.de>
Tue, 13 Aug 2013 22:49:38 +0000 (15:49 -0700)
committerNico Weber <nicolasweber@gmx.de>
Tue, 13 Aug 2013 22:49:38 +0000 (15:49 -0700)
Proof reading


Trivial merge