use nl2br only on text mails, not on html mails
ignore strict errors, are in E_ALL since php 5.4
Merge branch '1.8' into 1.9

Conflicts:
	Vps/Setup.php
don't extend Zend_Loader

- we don't need any features from it
- fixes strict errors
use proper operator when removing strict from error reporting
Merge branch '1.8' into 1.9

Conflicts:
	Vps/Setup.php
Merge branch '1.9' into 1.11
mark failing test incomplete
Merge branch '1.8' into 1.9
Merge branch '1.9' into 1.11
Merge branch '1.11' into 2.0

Conflicts:
	Vps/Setup.php
Merge branch '2.0' into 2.1
Merge remote branch 'origin/2.1' into 3.0

Conflicts:
	Vps/Setup.php
	tests/Vps/User/RealModelTest.php
don't report strict errors
fix statistic if piwik is not loaded (happens on test server)
fix cache id usage, this cache apperently never has been used
Merge branch '3.0' into 3.1
Merge branch '3.1' into 3.2