Merge branch 'master' into 'master'

Marius Cramer

2014-08-14 c0914f828a0087636eb775c984680a410d975494

1
2
3
 
-- increase column size
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;