Merge branch '5536-retry-discover-servers' closes #5536
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 24 Mar 2015 13:29:38 +0000 (09:29 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 24 Mar 2015 13:29:38 +0000 (09:29 -0400)

Trivial merge