Merge branch 'master' of orgmode.org:org-mode
commitb2e38cb030bc8c2c7927ed6a2226bb99b2e3fc17
authorBastien Guerry <bzg@altern.org>
Sat, 23 Feb 2013 13:37:43 +0000 (23 14:37 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 23 Feb 2013 13:37:43 +0000 (23 14:37 +0100)
tree88ce2f728d6c3f25ed9ffe94039887964591191b
parent8900b27fc80b6754ee32ca87b31440dad340d2b5
parent57fb6ffa4ddb248a30a883bc20475f0dc5e37b27
Merge branch 'master' of orgmode.org:org-mode