Merge branch 'maint' of orgmode.org:org-mode into maint
commit0a8fe04a9d832c228c048c4775541b59efeef2ae
authorBastien Guerry <bzg@altern.org>
Wed, 15 Jan 2014 08:21:59 +0000 (15 09:21 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 15 Jan 2014 08:21:59 +0000 (15 09:21 +0100)
tree536dd3c90670b48170346a4d4071ff8322b1131b
parent947c3f5c2ad10c262904802aad81ae4d622ccfe5
parent723306d6e7797279448fd9b1cabc4beba8cc897b
Merge branch 'maint' of orgmode.org:org-mode into maint
lisp/org.el