Merge branch 'master' into ilios-tests
Turn on MySQL
MySQL is started automatically
create database for continuous integration tests
install phing on continuous integration server
move file copy to before_script
run phpunit from repository root
failonerror="true" means that the build will fail if builddir does not already exist. Leaving it out means that a warning is printed but the build continues.
Merge branch 'master' into ilios-tests
use phing to build app
set encryption key for testing
Merge branch 'master' into ilios-tests

Conflicts:
	build.xml
Merge pull request #67 from ucsflibtopfstedt/master

bugfix to build script, refs RM issue 3174
extended mime-type mapping for .pptx files

mime-magic "detects" Microsoft PowerPoint 2007/2010 OpenXML files as Microsoft PowerPoint 97 files.
Sure - WHY NOT! :hankey:
Merge pull request #69 from ucsflibtopfstedt/rb2.2

various fixes and improvements
Merge pull request #70 from ilios/rb2.2

reintegrate release branch
Merge branch 'master' into ilios-tests
init copy configure package = build
Merge pull request #68 from Trott/ilios-tests

Get rid of DB warnings on CI phpunit tests using PHP 5.4