Merge branch 'master' of orgmode.org:org-mode
commit0461d55c417c1ea56479a2d09ade15505e269f52
authorBastien Guerry <bzg@altern.org>
Fri, 1 Jul 2011 07:38:47 +0000 (1 09:38 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 1 Jul 2011 07:38:47 +0000 (1 09:38 +0200)
tree49440d3eb8359448cd2ab16607291485887a7857
parentd29890839436cf73bda14852185a85f8dbe50dd9
parent311b09d92644f39040087327d6a1dbeb09a9ab6e
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el