Merge branch '3504-clients-compatible-with-3036' refs #3504
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 22 Aug 2014 13:58:19 +0000 (09:58 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 22 Aug 2014 13:58:34 +0000 (09:58 -0400)

Trivial merge