Merge branch 'maint'
commitaa19233d80455f8f21f3a496c4c10ccc7a7d6058
authorBastien Guerry <bzg@altern.org>
Wed, 5 Feb 2014 09:57:01 +0000 (5 10:57 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 5 Feb 2014 09:57:01 +0000 (5 10:57 +0100)
tree66eebfc3114033289f89e32480aa1f5f304fb964
parent655e07730bbc68ebca7faabbb00289446a4ffeb2
parenta08bff41384389321d5ecc4180e176bd7361a402
Merge branch 'maint'
lisp/org.el