Merge branch 'maint'
commitdaea0c7ce4ee577d30f22be1a33ee984a78e6219
authorBastien <bzg@gnu.org>
Mon, 7 Sep 2015 14:59:58 +0000 (7 16:59 +0200)
committerBastien <bzg@gnu.org>
Mon, 7 Sep 2015 14:59:58 +0000 (7 16:59 +0200)
tree6dbec2dcf3ff6da6944654c092227a3ac8822546
parent4ca3d3bbe2ab2ec2a308214a75e6eb0f079b8e52
parentaff6142b81fb3432510de62624bdf09027c1a679
Merge branch 'maint'
lisp/org.el