ref: 1d679a8357e8d2389d7dfa683d8a39ef139ed0c5
parent: 5cad8a60c9268a34ec0a658fa7b2cf7c1bdfc9fb
parent: 65616c2c533fba413fffdcdf894b4ce69e29f2ce
author: Ethan Hugg <ethanhugg@gmail.com>
date: Tue Jun 10 07:02:43 EDT 2014
Merge pull request #940 from mstorsjo/minor-cleanup Minor cleanups