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)
commit5cdd9c170ff4c5c3ac4c5101ee4a9ada47a4adce
treeb4abd56054e783d949be6e77f03beffd19aec208
parent503254168510f46f55da0fcf6c49436c900920b5
parent65ecef658fb337d97db7025bcdd4107276988543
Merge branch '5529-build-and-test-keepproxy-docker-image'

refs #5529