Merge branch 'maint'
commiteceb2ff7d118b57b102cef373947f9d087136b86
authorBastien Guerry <bzg@altern.org>
Tue, 7 May 2013 13:11:59 +0000 (7 15:11 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 7 May 2013 13:11:59 +0000 (7 15:11 +0200)
tree9eca87bf9690311aa894712ca20656a1bdf3c35d
parent706a546fcf7c860a23edc5ce22556806ed2aed12
parent0df6bcdf2a28820799fec60e652c42fb144bea68
Merge branch 'maint'
lisp/org.el