Merge branch 'master' of orgmode.org:org-mode
commite2af881caf6984236d68ad32fe4965838af22d01
authorBastien Guerry <bzg@altern.org>
Tue, 7 Aug 2012 08:40:41 +0000 (7 10:40 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 7 Aug 2012 08:40:41 +0000 (7 10:40 +0200)
tree708e601dda9cac95b31540ffe09a944a4cba00e4
parent93acc82b9608a3d4f5bff2018b6217df9c69663e
parentd02eedc987ab73ae5de5dacf3825536c3252c6e5
Merge branch 'master' of orgmode.org:org-mode