Merge branch 'maint'
commitad1e98a23c4149653b5c4a4dcdaa4fa923e3c761
authorBastien Guerry <bzg@altern.org>
Tue, 14 May 2013 14:07:38 +0000 (14 16:07 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 14 May 2013 14:07:38 +0000 (14 16:07 +0200)
tree80e7abef9dc47a03c23e30897b54fe4b72f3ea59
parent77cef42138a43a6b9c112bc317497e6f5b77da34
parent2ae3e91076177b84f9f8875ac23f4ba2a7fcde97
Merge branch 'maint'
lisp/org.el