Merge branch 'maint'
commit6e0e76308c3ebc9f195534891f0aa7513717f6da
authorBastien Guerry <bzg@altern.org>
Mon, 17 Mar 2014 20:22:20 +0000 (17 21:22 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 17 Mar 2014 20:22:20 +0000 (17 21:22 +0100)
treec216abe66db71a4127ef26a5b40d956e2c7d2af1
parent2202826e5e0d18bb632aa9ff27405809aac9712a
parent3074d081e7d7d6551c04ab239cc6a90ebcbfa9fa
Merge branch 'maint'
lisp/org.el