Merge branch 'maint'
commitf86d99a292ef9c567d530b496392a13d8a30e585
authorBastien Guerry <bzg@altern.org>
Fri, 30 May 2014 06:47:26 +0000 (30 08:47 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 30 May 2014 06:47:26 +0000 (30 08:47 +0200)
tree5475edb0a924fe5a09a0cafc28b0cb91e8ac2fb2
parent554c9e3228b54044a0fbe1caa4008a4cefdd87b6
parent822dcfc881a5df3249fcecf4b7bc71ee9c321b92
Merge branch 'maint'
lisp/org.el