Merge branch 'master' of orgmode.org:org-mode
commitaaad53f50a5c412ab813d2c84d6e4f87cf86ab03
authorBastien Guerry <bzg@altern.org>
Sat, 9 Apr 2011 10:45:04 +0000 (9 12:45 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 9 Apr 2011 10:45:04 +0000 (9 12:45 +0200)
tree913f8bf948a8c35039b39546de2d425a3b3345c5
parent97ae0949602a0f71ead0e8a77e3d19d0486d9339
parent5efc6f5fc4cb3a81041d8ee39739827ddd034416
Merge branch 'master' of orgmode.org:org-mode