Merge branch 'master' of orgmode.org:org-mode
commitbe7490ae9e2332e47b1d414e7e81851debd25d2a
authorBastien Guerry <bzg@altern.org>
Sat, 26 Feb 2011 16:17:03 +0000 (26 17:17 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 26 Feb 2011 16:17:03 +0000 (26 17:17 +0100)
tree60be27bb9234509d4681b65108fc47ef47279db2
parent1d404f8f96741266e06f9a6b4f5758728e27fb15
parent3ea00f215af29ef02f9ff50ea307b035d5abf0f3
Merge branch 'master' of orgmode.org:org-mode