Merge branch 'master' of orgmode.org:org-mode
commit26b084d3b540dfb01b439a78c6b53185b8d1d6c8
authorBastien Guerry <bzg@altern.org>
Thu, 21 Jul 2011 10:28:43 +0000 (21 12:28 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 21 Jul 2011 10:28:43 +0000 (21 12:28 +0200)
tree4bdcd357a6e10392e363a2b6e24526b3b9f0d689
parent0625a74b085d08fdd1e1fabfb8da094d15eb9652
parentfd0f8e10d1d3a339da9460d6c71283e85897c455
Merge branch 'master' of orgmode.org:org-mode