Merge branch 'maint'
commit96323cf2aa1f25f75eb13a49501aa185c8719fd3
authorBastien Guerry <bzg@altern.org>
Sun, 27 Jul 2014 23:03:03 +0000 (28 01:03 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 27 Jul 2014 23:03:03 +0000 (28 01:03 +0200)
treec10b6cd46fb8a08b4dce3cf8d6c57381e80b7be8
parentaef3b6c3f94683e6b987fc1144447168683b8f6d
parentd8a0ee7aadd7e7bf986184d4597f6cfa30fa2205
Merge branch 'maint'
lisp/org.el