Merge branch 'maint'
commit2dd548a4e03dc3b9aee9774b4e7c9a04d079beab
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 18 Feb 2015 01:04:39 +0000 (18 02:04 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 18 Feb 2015 01:04:39 +0000 (18 02:04 +0100)
tree25a39bf4cfcecb8e1df41a2e2c85647fba729b43
parent451c7b324735d4a750e1521b8bd67dc19ee138fc
parentc41bbc577e81e9fa5bab2509a8141189e45fe6c7
Merge branch 'maint'
lisp/org-src.el