Merge branch 'master' of orgmode.org:org-mode
commitd910b8ae8771ca2bcb9d8b47352e1a6fe00855af
authorBastien Guerry <bzg@altern.org>
Mon, 12 Dec 2011 17:38:35 +0000 (12 18:38 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 12 Dec 2011 17:38:35 +0000 (12 18:38 +0100)
tree0e881cbcee82f05dd9d8ae8be0d6062ddadf6537
parent9aec216b04137265725835ce7d5ab193d0a1cd94
parentf30ade01513d958dbd1f088999639a247cf4435e
Merge branch 'master' of orgmode.org:org-mode