Merge branch 'master' into 2449-keep-index-status-handlers
authorTim Pierce <twp@curoverse.com>
Tue, 15 Apr 2014 21:20:12 +0000 (17:20 -0400)
committerTim Pierce <twp@curoverse.com>
Tue, 15 Apr 2014 21:20:12 +0000 (17:20 -0400)
commitb346f8754f5d4840ad80aa97bd910f3a6844b413
tree571a7ef39222eb50d162187800734f9f0c76cbe9
parente6815764c940968ed825e8b2e4d984824a68fd23
parentc2aeaa729c350a33ec47ae1b012e50a6685ac2d2
Merge branch 'master' into 2449-keep-index-status-handlers