4156: Merge branch 'master' into 4156-bundle-install-user
authorTom Clegg <tom@curoverse.com>
Fri, 5 Dec 2014 17:59:44 +0000 (12:59 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 5 Dec 2014 17:59:44 +0000 (12:59 -0500)
1  2 
jenkins/run-tests.sh

Simple merge