Merge branch 'master' of orgmode.org:org-mode
commit8ad81bfda7c2b7a70a476cbc23e71fe276883191
authorBastien Guerry <bzg@altern.org>
Mon, 16 Jan 2012 08:50:35 +0000 (16 09:50 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 16 Jan 2012 08:50:35 +0000 (16 09:50 +0100)
tree3251eb41aca5f15106cf24cf75188229d5433abe
parent9d045aa16954e98a4aa56e855d17bf9256fbb2e0
parent812d0a53758d36424cf2c2044b0e43c14cde33fd
Merge branch 'master' of orgmode.org:org-mode