Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 10 Jul 2013 12:14:18 +0000 (14:14 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 10 Jul 2013 12:14:18 +0000 (14:14 +0200)
commit50749996053f4b9fbadaa5ba3bbea2b6826d50e7
treeb85cafb73febd9b1c52a1d3251e05411e41cc0ef
parent044c8c5ebb903dc4a83846c9d2290b0611eaefdf
parent136081a0d4dfe782f66c70daa5d4f35999dad86a
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el