Merge branch 'maint'
commit6f20e3f0ffb771aaa6582780d9f2bc1977824b2d
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 25 Jul 2013 17:00:51 +0000 (25 19:00 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 25 Jul 2013 17:00:51 +0000 (25 19:00 +0200)
tree7e769930930ae62b5d9cbb8ad41a86439b58b90d
parentf00d759765bfa94adeea53eed23bb642424d04e6
parentaf300bd5b0b77086c5b4589f823dcb783e1e7c56
Merge branch 'maint'
lisp/org.el