Merge branch 'maint'
commita09835d8447eea67e7819974f6d506e6ba3970a4
authorBastien Guerry <bzg@altern.org>
Thu, 4 Jul 2013 13:26:35 +0000 (4 15:26 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 4 Jul 2013 13:26:35 +0000 (4 15:26 +0200)
treea6c0d90f033f46c583bf24b94b446665bbc7608c
parentba7c19397848f4d68bc9541c98cbeb6f4d9f0d85
parent9bec9f1cd07340ea50325fbda849e30997c42558
Merge branch 'maint'
lisp/org.el