Merge branch 'master' of orgmode.org:org-mode
commitab075bb45219111f2fa77f744b91be3cfbe48222
authorPaul Sexton <psexton@xnet.co.nz>
Fri, 13 May 2011 10:45:26 +0000 (13 22:45 +1200)
committerPaul Sexton <psexton@xnet.co.nz>
Fri, 13 May 2011 10:45:26 +0000 (13 22:45 +1200)
treef3004592ddf943472ab3b2acdc1636545e8e23d7
parentdf1a730e2531c898643cc3abdacd0b794e0b240b
parentd6aba4db77654481e424de206ec7047244df0f3b
Merge branch 'master' of orgmode.org:org-mode