Merge branch '2436.less-scary.3'
authorBrian Warner <warner@lothar.com>
Wed, 29 Jul 2015 00:38:09 +0000 (17:38 -0700)
committerBrian Warner <warner@lothar.com>
Wed, 29 Jul 2015 00:38:09 +0000 (17:38 -0700)
commit28399b689203a0841880cc03b378dcc0a696d8a3
tree42070504212f6eda636d4310f7c3a3589d007c1e
parent29ab496bd75c8f9c1891f7a97ff9e682c79277e4
parent023f9fa4d3f9763181045b3b4a44e73419e2ac5f
Merge branch '2436.less-scary.3'

This reverts and improves the earlier fix for ticket:2436