Merge branch '4889-crunch-deadlock'
authorTim Pierce <twp@unchi.org>
Thu, 22 Jan 2015 22:08:20 +0000 (17:08 -0500)
committerTim Pierce <twp@unchi.org>
Thu, 22 Jan 2015 22:08:20 +0000 (17:08 -0500)
commit38e27663cf656f0c9c443a2715f249afe39a8bfb
tree4b613dd3600b58ecb5c4a8566cfedeb1109aaf8b
parent1fae5d56406b1f6f713899392eb073c19b6e8023
parent08671179720e2e8a96ef740c1b9c60c931477d20
Merge branch '4889-crunch-deadlock'

Fixes #4889.