Merge branch 'master' of orgmode.org:org-mode
commit22f34369fdb8b1c7b0909d7d78a1664937914e4c
authorBastien Guerry <bzg@altern.org>
Tue, 28 Jun 2011 23:56:51 +0000 (29 01:56 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 28 Jun 2011 23:56:51 +0000 (29 01:56 +0200)
tree21b5c12146c9b1ee7c2281e7661f76329f64a688
parent7311ac5d4f755340a2046426f2a0d159f9d90368
parent0bcdf0b72b7728dcd23edf99b13701f23e136cfc
Merge branch 'master' of orgmode.org:org-mode