Merge branch 'maint'
commitbd7c2a59e8ec5080b128ddbba51ce6eb799176e3
authorBastien Guerry <bzg@altern.org>
Mon, 31 Dec 2012 14:12:16 +0000 (31 15:12 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 31 Dec 2012 14:12:16 +0000 (31 15:12 +0100)
tree5fced8761698ee0c8713544f89f429d182f282b0
parentbf537b5139d7d7921f67f70bc2cbf715f88e9894
parent841a81007d63b3fda0bcac0bcb62a26a4c9cfe98
Merge branch 'maint'
lisp/org.el