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)
Two bug fixes that come from the recent push


Trivial merge