Merge branch 'master' of orgmode.org:org-mode
commitee483e98f79d62b30325e8b828c64ac18e80b91d
authorBastien Guerry <bzg@altern.org>
Wed, 8 Aug 2012 10:11:57 +0000 (8 12:11 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 8 Aug 2012 10:11:57 +0000 (8 12:11 +0200)
tree518e0eb7fc4292dd2cca18b853354df0d7195d89
parent1c595f3e5dc4001c718e71e18633bb7dd11fb652
parent4983e864442467461f73f5a6fbf86725eae684a6
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el