Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Sun, 24 Jul 2011 22:55:18 +0000 (00:55 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 24 Jul 2011 22:55:18 +0000 (00:55 +0200)
commit642c6667666f1f86f8a461e7bbbc8a2e7510b4b9
tree03d9ef3fc691bccdf52ea399079409e7a4f335ab
parent829e226536ab65cc737b387f3d6df4e8ff2fdf03
parent6b6ab138109912f59fcc3f4f3c0d076129213920
Merge branch 'master' of orgmode.org:org-mode