Merge pull request #1611 from eileenmcnaughton/master
authorTim Otten <to-git@think.hm>
Thu, 5 Sep 2013 23:12:38 +0000 (16:12 -0700)
committerTim Otten <to-git@think.hm>
Thu, 5 Sep 2013 23:12:38 +0000 (16:12 -0700)
another test tweak


Trivial merge