Merge branch 'master' of orgmode.org:org-mode
commitacdf82f66e8fc7e43d33ba8856977b0984f5e6ed
authorBastien Guerry <bzg@altern.org>
Sat, 9 Apr 2011 14:20:18 +0000 (9 16:20 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 9 Apr 2011 14:20:18 +0000 (9 16:20 +0200)
tree3848dc54559d80d49b67cd720aa08c8cde79e526
parenta8a436317c9d0fb1c8d5fb4d452f9ed55b4703cf
parenta7a4693f66d90691b06afd89d4f44575042c5dfd
Merge branch 'master' of orgmode.org:org-mode