Updating so configuration file can be used in Travis build
Merge branch '2012-03' of https://github.com/cc5tudio/jtine-2.0 into 2012-03

Conflicts:
	tests/tine20/phpunitconfig.inc.php