Add some extension/mimetype aliases to fix some quirks in attachment type validation (#1488891)
Ensure backwards compatibility by considering old-style skin_path attribute for <roundcube:include ...> tags
Match regex on multi-line sql statements
Fix vcard folding when outputing already generated vcard
Merge branch 'master' of github.com:roundcube/roundcubemail
Be less restrictive on vCard import, do not require FN when N exists