Merge branch 'maint'
commit580b7fce95b64a1a951d2426453a214e574e44eb
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 31 Aug 2013 12:34:37 +0000 (31 14:34 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 31 Aug 2013 12:34:37 +0000 (31 14:34 +0200)
tree0c20468ae4b7dde92b9fe919389eaa5f06444440
parentd11ba3ade6bcbfd260fd0d8400a7932e3a8523aa
parent22b4473fccce6fc316d0f6d86f9ecc6b71d15b12
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el