Merge pull request #936 from nico/cleanup
authorNico Weber <nicolasweber@gmx.de>
Thu, 19 Mar 2015 03:56:28 +0000 (20:56 -0700)
committerNico Weber <nicolasweber@gmx.de>
Thu, 19 Mar 2015 03:56:28 +0000 (20:56 -0700)
Minor cleanups. No behavior change.


Trivial merge