Merge branch 'hotfix-7.8.06'
commit5fc7b7d138ca3083fe7441d36d5b041783cecff6
authorBastien Guerry <bzg@altern.org>
Tue, 27 Mar 2012 10:22:04 +0000 (27 12:22 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 27 Mar 2012 10:22:04 +0000 (27 12:22 +0200)
tree50d262c2267237d985d9c57f7b8a5ba1922fa7f4
parentc760f9be7ee1e3ad3cbd4e58801491229ddb1458
parent410dd12d8976817f70f508c249697172e8c6739b
Merge branch 'hotfix-7.8.06'
contrib/lisp/org-mime.el