Merge branch 'maint'
commitbc0b22120347815195657bdee1df35b599e8abe0
authorBastien Guerry <bzg@altern.org>
Tue, 1 Jan 2013 16:40:31 +0000 (1 17:40 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 1 Jan 2013 16:40:31 +0000 (1 17:40 +0100)
treef7b2bc61a449fd44c366b7f90142ca9cc1983877
parent55e1489d9821412e6a299c1da58ff4f6392eed9d
parentfc2aae5d810c1dd570694661c2a73794c8d454d5
Merge branch 'maint'
lisp/org.el