Merge pull request #26 from d1b/master
commit0e7bda008324cfe5ac1401d9cef73c1e973fc14d
authorioerror <jacob@appelbaum.net>
Fri, 6 Jul 2012 15:11:06 +0000 (6 08:11 -0700)
committerioerror <jacob@appelbaum.net>
Fri, 6 Jul 2012 15:11:06 +0000 (6 08:11 -0700)
treeacec435564dbf4db33c3f7b9ab43f649e5609efa
parent819b0f00f9cacd82223eaf5dd30f7bb33b16bab0
parent957da94624af875e5986e435d2d249bcbd202946
Merge pull request #26 from d1b/master

Merge d1b's changes