Merge branch 'maint'
commit029b393032acb29a4ca15815dd6b2a0a89e4d0d6
authorBastien Guerry <bzg@altern.org>
Thu, 29 May 2014 17:49:07 +0000 (29 19:49 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 29 May 2014 17:49:07 +0000 (29 19:49 +0200)
tree87b88644bbeb32521bba236572dd3302dd565727
parentb978abb485cd4fbe8d32f5440ce91b707e7d2b16
parentd8034c3b19519f33d16bbdf482c2ec584f57fca4
Merge branch 'maint'
lisp/org.el