Merge pull request #15 from cartazio/master
authorEdward Kmett <ekmett@gmail.com>
Mon, 15 Sep 2014 19:50:07 +0000 (15:50 -0400)
committerEdward Kmett <ekmett@gmail.com>
Mon, 15 Sep 2014 19:50:07 +0000 (15:50 -0400)
commit537599bcf9365da3b6b6554ffa4be145192f3d68
tree27d8c3213f571498df91c26cd2e9a7e94e256143
parentf2a3544b537f987ba7f2f311109b3f97a0281cfe
parent673ac3336ed1bf7b3e4d27ed613d2f71dbc52703
Merge pull request #15 from cartazio/master

prepping for the 1.1 fixup release