Merge branch 'maint'
commite08dca9690ac6f51d343a1fdc4f4e9738e6a6c5e
authorRasmus <rasmus@gmx.us>
Sun, 15 Mar 2015 20:53:13 +0000 (15 21:53 +0100)
committerRasmus <rasmus@gmx.us>
Sun, 15 Mar 2015 20:53:13 +0000 (15 21:53 +0100)
treef099583e570ef8aefa924dfe65757eb4fcfe243d
parent4d7772c6a45398eae1b25a1e4b01283976d2cf06
parent19a7d6864d0566597dfcc3c80320966864f8198b
Merge branch 'maint'
lisp/ox-man.el