Merge branch 'master' of orgmode.org:org-mode
commit64e8b941a8f2c9ed594d41df558518d3fec7ab51
authorBastien Guerry <bzg@altern.org>
Sat, 31 Dec 2011 08:30:59 +0000 (31 09:30 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 31 Dec 2011 08:30:59 +0000 (31 09:30 +0100)
treedd84c5b0762a9bd266ca175e1c17f660c2f6a000
parentd1b5b65c47cf5b61766d5d9e01ee2eb08ae09dc9
parent4a0cb0dbd18dc59361e923e6c74921bc6de1d1a0
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el