Merge branch 'maint'
commitff2d373dc3701d896225876938120dae318e1268
authorBastien Guerry <bzg@altern.org>
Wed, 30 Jan 2013 16:53:30 +0000 (30 17:53 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 30 Jan 2013 16:53:30 +0000 (30 17:53 +0100)
treee644360e3d039f94ee005b1e1238463eaf521df5
parente81ed15d7d547c624b0682c54a62cdca506981cc
parentebad7d9226c38e6c3886b00cee6233f69ffd6c78
Merge branch 'maint'
lisp/org-macs.el