Merge branch 'master' of orgmode.org:org-mode
commitae02e3f3337b94da9cab0799f57235f4a688e4f0
authorBastien Guerry <bzg@altern.org>
Sat, 29 Oct 2011 13:01:10 +0000 (29 15:01 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Oct 2011 13:01:10 +0000 (29 15:01 +0200)
treee88db47936dca486c5ca841d7716bb89669a4737
parent97d107d981e060ea6f2584593dc4f4da7ebf1bb9
parentf2b3fe7318d6006d868d765ac20160ca9fcd4545
Merge branch 'master' of orgmode.org:org-mode