Merge branch 'maint'
commit7221b88f6d4145d007ecc229d220e5e99709c33b
authorBastien Guerry <bzg@altern.org>
Sat, 27 Oct 2012 07:39:12 +0000 (27 09:39 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 27 Oct 2012 07:39:12 +0000 (27 09:39 +0200)
treefa1bdc5189daa44f3de304d380bb33ead8962f72
parentb0eeb260ef8a6dafab4d548a254e15d8e5e07863
parentdda453eb7e4c7d67c22f1dd0dba3302b8db391cb
Merge branch 'maint'
lisp/org.el