Merge branch 'master' of orgmode.org:org-mode
commit72336716589e149e22e455f4bd7235715544e998
authorBastien Guerry <bzg@altern.org>
Tue, 17 Jan 2012 07:44:38 +0000 (17 08:44 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 17 Jan 2012 07:44:38 +0000 (17 08:44 +0100)
tree3c9298c6149a6fc25f73b49aadb7545ab8b6b141
parent8ad81bfda7c2b7a70a476cbc23e71fe276883191
parent94f10ddfd70ee0b5b87cd094fc434bee15477fc0
Merge branch 'master' of orgmode.org:org-mode