Merge branch 'master' of orgmode.org:org-mode
commit4fc3e71f10f238cd2461b785b8ec1b0ecb4ec16b
authorBastien Guerry <bzg@altern.org>
Mon, 7 Mar 2011 16:25:11 +0000 (7 17:25 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 7 Mar 2011 16:25:11 +0000 (7 17:25 +0100)
tree4d1bfb2ef14465388bc3f97c7759958027fbde14
parent9784af675c40d7d2b20179d9ae09dc4183055662
parent7cb0891f7ab79e41e4c4c497b10539084f278973
Merge branch 'master' of orgmode.org:org-mode