Merge branch 'maint'
commitb414844daac3ef239419168ede9bd15808dc47da
authorBastien Guerry <bzg@altern.org>
Sun, 15 Jun 2014 08:49:36 +0000 (15 10:49 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 15 Jun 2014 08:49:36 +0000 (15 10:49 +0200)
tree106d1c31e01aa5b1b3b9a4a457572f3c8b8d46c7
parente30c6cc44bba996b1153a5ba91ad69d846592e2b
parent88036251eb09e4b756ffedcfb7d9b767d8cefec8
Merge branch 'maint'
lisp/org.el