Merge branch 'master' into 2449-keep-index-status-handlers
authorTim Pierce <twp@curoverse.com>
Mon, 14 Apr 2014 20:41:33 +0000 (16:41 -0400)
committerTim Pierce <twp@curoverse.com>
Mon, 14 Apr 2014 20:41:33 +0000 (16:41 -0400)
commitad2984e6eaf029ba7b6e35ae875bb78cfb76dfb6
tree806482f620a7953681e27499fc8fc8ee1a854da6
parent9067fd12d2c4259a2988286663098c59af18c854
parent5df09e707c313fd88c32ad40f2d99030ecc2e639
Merge branch 'master' into 2449-keep-index-status-handlers