Merge branch 'maint'
commit99a23ba4361bec79083e7ab187131a503199e8cb
authorBastien Guerry <bzg@altern.org>
Thu, 30 Jan 2014 11:43:02 +0000 (30 12:43 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 30 Jan 2014 11:43:02 +0000 (30 12:43 +0100)
tree9c7ad3bbc06de25060b8f387e1b20c5a19eb7b7e
parent98de33a9acfd59f0c64020db998adb0fe8129551
parent53c664c4ec4c8ec265dbc85a35dc4862a57a82ce
Merge branch 'maint'
lisp/org.el