Merge branch 'maint'
commitc264904b123793d94cce07d0a67c7e8eb86145f8
authorBastien Guerry <bzg@altern.org>
Tue, 20 May 2014 21:28:33 +0000 (20 23:28 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 20 May 2014 21:28:33 +0000 (20 23:28 +0200)
tree875d1b86dc5d71ec4328f941c78bf182c6e003c5
parentd2b7c50880704e63fd54a528799abd5af47a6b3b
parent03acfe44b69a0c48b2806db3c49536df75d6499c
Merge branch 'maint'
lisp/org.el