Merge branch 'maint'
commit590cb1227a2cdb1a1df70665f80f3b4ff13ce3fc
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 30 Apr 2016 23:30:57 +0000 (1 01:30 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 30 Apr 2016 23:30:57 +0000 (1 01:30 +0200)
tree247dbf55158b5da56c7f983950437c0560b7742b
parentbb034dfe049a5804b6c0e0b93320409b1116e010
parentaf853dd3aa4ce42f8e860ed45ced7f922cb08091
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el