Merge branch 'master' of orgmode.org:org-mode
commita379f9c6ad32d6cfc1907493b11687ee6aee6919
authorBastien Guerry <bzg@altern.org>
Thu, 13 Jan 2011 12:06:57 +0000 (13 13:06 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 13 Jan 2011 12:06:57 +0000 (13 13:06 +0100)
treeb10042f96500e9b9142affeef0b9a312fe3eaed5
parent4c2ad5f87cfea5a722d60b737b858e1559c7697d
parent0ec831d2c898a1cf65787efaf212330a1ccf2b17
Merge branch 'master' of orgmode.org:org-mode