Merge branch 'maint'
commit54431e2a5b1a1e4e4ab52bf01525bc985bb82304
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 22 Aug 2013 19:55:51 +0000 (22 21:55 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 22 Aug 2013 19:55:51 +0000 (22 21:55 +0200)
tree5e59569cd23eb37a30aa41680575c0bb429ae04b
parent6fdc2361c93d2f77bcc81b479b6d68d57bd268a2
parent9e51049b22c90df349ae914d8142362b5bf22090
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el