Merge branch 'master' into 1885-keep-proxy refs #1885
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 23 May 2014 14:27:59 +0000 (10:27 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 23 May 2014 19:54:01 +0000 (15:54 -0400)
commit8570c81e79a9c00a314e2cf28a008b9aeae65037
tree114dbee3232a56715300606ac4e18be9bdda5ed0
parent8815915612d1d8fef2001083bec2a24b3ed2eb3f
parent2099a0a3f0ef3371ba30ed0955bbc75ffa332701
Merge branch 'master' into 1885-keep-proxy refs #1885