Merge branch 'master' of orgmode.org:org-mode
commita8a436317c9d0fb1c8d5fb4d452f9ed55b4703cf
authorBastien Guerry <bzg@altern.org>
Sat, 9 Apr 2011 12:56:00 +0000 (9 14:56 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 9 Apr 2011 12:56:00 +0000 (9 14:56 +0200)
tree42fbeef37d4fb91dc1c51d96e04576205de48038
parent814b767608eaad1872ee59cff31cc39f0b7f79b1
parent5c5468dc60277f4e97359cd9cc29c772e6dcf649
Merge branch 'master' of orgmode.org:org-mode