Merge pull request #2382 from eileenmcnaughton/failing-test
authorTim Otten <to-git@think.hm>
Mon, 20 Jan 2014 22:37:48 +0000 (14:37 -0800)
committerTim Otten <to-git@think.hm>
Mon, 20 Jan 2014 22:37:48 +0000 (14:37 -0800)
Failing test


Trivial merge