Merge branch 'master' of orgmode.org:org-mode
commitcadcbe3aa499c0cf35a7fe709df8d91a61849bde
authorBastien Guerry <bzg@altern.org>
Tue, 1 May 2012 11:03:56 +0000 (1 13:03 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 1 May 2012 11:03:56 +0000 (1 13:03 +0200)
tree1625a0a814d581c2c5b636d0b8eb6d5f9449a200
parentbe1727a68f1b20634483498e4238ffb63d6a2956
parent4f8e1e85b249ab6319a61feeab7514653321d9ed
Merge branch 'master' of orgmode.org:org-mode