Merge branch 'maint'
commitc6d698a5ecfbb3810b08f483c447338d6eef6649
authorBastien Guerry <bzg@altern.org>
Fri, 25 Apr 2014 07:28:43 +0000 (25 09:28 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 25 Apr 2014 07:28:43 +0000 (25 09:28 +0200)
treefac080c6bef2c1862eaf1f8b852ebaec80675eeb
parent36b497720d85af627f93cc4eb68ac9bed4a8e3f8
parentfc37d1020a928b69ecb02592d521faf84d0051ff
Merge branch 'maint'
lisp/org.el