Merge branch 'master' of orgmode.org:org-mode
commit2df6f65e237920339c773ff2499cf060bc83fa32
authorBastien Guerry <bzg@altern.org>
Sat, 12 Feb 2011 15:53:21 +0000 (12 16:53 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 12 Feb 2011 15:53:21 +0000 (12 16:53 +0100)
treecf543ddd1aec1f1d36d3c741773d98d0749aa336
parent8ec508b1284174860d97084f1c522bf21051e6a7
parent775d962788c6105dc3ba71722b497d1293b53ce4
Merge branch 'master' of orgmode.org:org-mode