Merge branch '5529-build-and-test-keepproxy-docker-image'
authorWard Vandewege <ward@curoverse.com>
Mon, 23 Mar 2015 20:49:46 +0000 (16:49 -0400)
committerWard Vandewege <ward@curoverse.com>
Mon, 23 Mar 2015 20:49:46 +0000 (16:49 -0400)
refs #5529


Trivial merge