Merge branch 'maint'
commitbf537b5139d7d7921f67f70bc2cbf715f88e9894
authorBastien Guerry <bzg@altern.org>
Mon, 31 Dec 2012 10:29:26 +0000 (31 11:29 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 31 Dec 2012 10:29:26 +0000 (31 11:29 +0100)
tree84b328192daaa01b978c9b4343012486e62df5a5
parent6fd066fb183fced8a8410d49a108420988e63321
parent001b6d1ebdd6e55097e60d4862c9baf98718a002
Merge branch 'maint'
lisp/org.el