Merge branch 'maint'
commit060fc1ca2c8dee0c55e610c1d5c244b32c623efb
authorBastien Guerry <bzg@altern.org>
Tue, 20 May 2014 16:00:20 +0000 (20 18:00 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 20 May 2014 16:00:20 +0000 (20 18:00 +0200)
tree8eb8c57ed3ae15e5a067ab9aeeb3e6973386382c
parentcb8366cd21b688b11ce6e4ce4061b53d71c22fc9
parent6fab5bf04b6ec182c86db1fc7b879b73e83809a8
Merge branch 'maint'
lisp/org.el