Merge branch 'maint'
commitc5cbc6936ec0b08ff6060b59b7b9fab3c9cb5120
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 19 Aug 2015 09:15:52 +0000 (19 11:15 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 19 Aug 2015 09:15:52 +0000 (19 11:15 +0200)
treea540d9a6c413cf6f6c17c957089517a91ad68335
parentc9872990edd2ff1debf208971e248630b8011994
parent1abc4887a2748863e06e3f3b9ade050bbd6edb2e
Merge branch 'maint'
lisp/org.el