Merge branch 'maint'
commit34c458929a83e98fc70f2247d8cd8a240593076f
authorBastien <bzg@gnu.org>
Tue, 18 Aug 2015 09:53:54 +0000 (18 11:53 +0200)
committerBastien <bzg@gnu.org>
Tue, 18 Aug 2015 09:53:54 +0000 (18 11:53 +0200)
treecb174bbf241923ce850865307115e5b208b7b5a9
parentaf7ea548b038be656e37adcb655d871de13b58d9
parent682bb962f3934cd50d28a9b2d0b0e0fb85746a03
Merge branch 'maint'
lisp/org.el