Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 07:46:36 +0000 (08:46 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 07:46:36 +0000 (08:46 +0100)
commit72cc2e99d84c1348261bd8100b3e7269259dc184
treeeb4ba3ec86a3c3fea226ab8eb3f0ccbac698278a
parent43297f9ab78d7386e801b171b6f6cd1686e78dbb
parent5f47cb2b9f51c8c74f64c0e3f09873a4f10d3302
Merge branch 'maint'
lisp/org-macs.el