Merge pull request #655 from nico/simp
authorNico Weber <nicolasweber@gmx.de>
Sun, 8 Sep 2013 02:16:49 +0000 (19:16 -0700)
committerNico Weber <nicolasweber@gmx.de>
Sun, 8 Sep 2013 02:16:49 +0000 (19:16 -0700)
Simplify.


Trivial merge