Merge branch 'maint'
commit21ce3296b7fb582617e7bf5689224be9c429f9b0
authorBastien Guerry <bzg@altern.org>
Fri, 31 Jan 2014 09:39:06 +0000 (31 10:39 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 31 Jan 2014 09:39:06 +0000 (31 10:39 +0100)
treee5a783695db30497144f0c4b292da4674ba216c9
parent4068a829a188a2ee7bfc072edb2d598388b9efb9
parent7ddebe5c7b4d57614a4b35d406796b8a613aff11
Merge branch 'maint'
lisp/org.el