Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 19 May 2013 07:54:18 +0000 (09:54 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 19 May 2013 07:54:18 +0000 (09:54 +0200)
commita5872b9ecac9573913146590c6c464b5a3588af4
treef2b40dec33a7e41456876b329b52273585700502
parenta2b81c7152f2a7c2c99c594fa39d23fb5643f3a1
parentaafb2d2b46ab4aded295ea9a81e8e2840628dc64
Merge branch 'maint'
lisp/ox.el