Merge branch 'xfs-quota' into 'stable-3.1'

Till Brehm

2016-04-24 bc6917486cdf177db87d9d6d1a2fad57bed17ce3

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