Merge CVS revision 1.18
authorMichael M Slusarz <slusarz@curecanti.org>
Thu, 6 Nov 2008 05:59:53 +0000 (22:59 -0700)
committerMichael M Slusarz <slusarz@curecanti.org>
Thu, 6 Nov 2008 05:59:53 +0000 (22:59 -0700)
commit8ef57953d921e733cb50c8d445c226eaadbd306e
tree49a4f705523d5c1549b1a6c7ce7cf15f2c3d56a6
parent877d6ab1c0afe43337ed38d0a3d98c4d0711c95a
Merge CVS revision 1.18
framework/MIME/lib/Horde/MIME/mime.mapping.php