Merge branch 'maint'
commit1a27bed477b472091c00ffa6d0f92bb2978db8cf
authorBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 10:52:04 +0000 (17 12:52 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 10:52:04 +0000 (17 12:52 +0200)
tree849aba083eb35ddb465c8227b7c01289a0bb180c
parentca80c8c2771d85e5f759a515ed4d4c90a39718fb
parenta937366e8ae306ed5ff7bed31fd1d0d54bc8d5de
Merge branch 'maint'
lisp/org.el