Merge pull request #162 from kberg/master
authorDan Vanderkam <danvdk@gmail.com>
Mon, 6 Aug 2012 21:55:40 +0000 (14:55 -0700)
committerDan Vanderkam <danvdk@gmail.com>
Mon, 6 Aug 2012 21:55:40 +0000 (14:55 -0700)
commit9127fa5eecec56c37330edd765156a0d28dbc8e9
tree9a53130ab5b9aa8b19e0cce399210238e4f9e2b2
parentddc5f0ee53bd5579b1bbd228ce8ce80a2f5d237c
parentde9ecc405c89626f6e3a01aec2458909d3ca2f81
Merge pull request #162 from kberg/master

Two bug fixes that come from the recent push