example cleanup
Merge branch 'master' of github.com:daviddeutsch/roundcubemail
Merge branch 'master' into cleanup-7