Merge branch 'reject_sender_login_mismatch' into 'master'

Marius Cramer

2015-04-15 85ffd16ba38cf6890d649efa284be8a822ebc25e

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