Merge branch 'maint'
commit81dad90342d93392f0c2cd33986dd192086969f2
authorBastien Guerry <bzg@altern.org>
Thu, 16 Jan 2014 11:07:37 +0000 (16 12:07 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 16 Jan 2014 11:07:37 +0000 (16 12:07 +0100)
treed9a3c408ff0c5738d1d624e77553f6bc2842db7a
parent3fafad7eecb23e9041c3120e0a75430d780f81ad
parentd16477913df4c91055239cf832c3da57152e751c
Merge branch 'maint'
lisp/org.el