Merge branch 'maint'
commit9263654e5bb72bb4d47670fc1dad2a3f131758d7
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 3 Jun 2014 21:28:56 +0000 (3 23:28 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 3 Jun 2014 21:28:56 +0000 (3 23:28 +0200)
tree22a851a7f18ceb60fbefb7f888bb43c42be29bc1
parent38ac0d8b565703bfacd0e57572144dae0e1b9b8d
parent88f2625f286b00bba7a4a2ac2ea74aa9e00cf0bb
Merge branch 'maint'
lisp/org.el