Merge branch 'maint'
commit0513f11b16dc0190e49391a9116e32f33f59a4fe
authorBastien Guerry <bzg@altern.org>
Mon, 29 Oct 2012 06:41:29 +0000 (29 07:41 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 29 Oct 2012 06:41:29 +0000 (29 07:41 +0100)
treecade73dc2892bff879469eb2ca0b8259fba8e5b2
parent90fcb4b841ee8a6d32c54d63ed98457a58586cea
parentd22e732d7a688622729fb2d4994cf95a94dd0598
Merge branch 'maint'
lisp/org.el