Merge branch 'maint'
commit47ea16660eec6e773806165db57ac7db035914f8
authorBastien Guerry <bzg@altern.org>
Wed, 12 Dec 2012 09:14:59 +0000 (12 10:14 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 12 Dec 2012 09:14:59 +0000 (12 10:14 +0100)
tree4a58bdee5c369239dcbe3829e9070e4171a77ebd
parent5508053d6334ff91f5122cf3797ee3dc3367982c
parent570ecb4e31e0ad3b9b2df175cc7d49d92b180631
Merge branch 'maint'
doc/org.texi
lisp/org.el