Merge pull request #1626 from eileenmcnaughton/master
authorTim Otten <to-git@think.hm>
Thu, 12 Sep 2013 03:43:57 +0000 (20:43 -0700)
committerTim Otten <to-git@think.hm>
Thu, 12 Sep 2013 03:43:57 +0000 (20:43 -0700)
commit4e6238e49de1dec037550a0d1f62b84c22258880
treef3fcb2298535284165ac3274453f7ee337bb014a
parent589f5b051fb6610e749eecff1edc7967f00d2de6
parent837c46604803ed527b8b3c10cbe37eaaa8470849
Merge pull request #1626 from eileenmcnaughton/master

test & comment block fixes