Merge branch '2879-docker-image-installer'
authorBrett Smith <brett@curoverse.com>
Thu, 12 Jun 2014 19:45:36 +0000 (15:45 -0400)
committerBrett Smith <brett@curoverse.com>
Thu, 12 Jun 2014 19:46:09 +0000 (15:46 -0400)
commitb251bf4a306e641aa4ab6e2c42469280c3285059
tree14d0a6450c96e309424aaaa6eec5d298bced7271
parent4d84c7d2c66ea255db24e2b4159bcafed29ef00d
parent95bb3f7e95b4f4383f201e5be235ac796486d1d0
Merge branch '2879-docker-image-installer'

Refs #2879.  Closes #2998, #3006.