Merge branch 'maint'
commit5e60677cf8d51daa81f802cedb00692b28a2d334
authorBastien Guerry <bzg@altern.org>
Sun, 20 Apr 2014 07:31:36 +0000 (20 09:31 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 20 Apr 2014 07:31:36 +0000 (20 09:31 +0200)
treefec16abceee7974b8be8ca38e14d2b0bd8873e6b
parentabd8e52dc0291b7c9c3fd45b59bc0afae2fc30d1
parentd9312231e96979b4f0855d794959c5442afd975a
Merge branch 'maint'
lisp/org.el