Merge branch 'maint'
commit783eb3170cd787127966371bb73e0cab6d9b9ee9
authorBastien Guerry <bzg@altern.org>
Mon, 11 Feb 2013 13:38:35 +0000 (11 14:38 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 11 Feb 2013 13:38:35 +0000 (11 14:38 +0100)
tree00a2af40241cd4f28efdb5ddc58777c03757f818
parent652919fca0a1b710087bc163cdb8c23588073535
parent0b9e3b8a45244f9930f8acc01715ca046ccce642
Merge branch 'maint'
lisp/org.el