Merge branch 'master' of orgmode.org:org-mode
commit312dbb63cbcfc43efcc613d68dbb1876843f0f00
authorBastien Guerry <bzg@altern.org>
Mon, 23 Apr 2012 19:42:23 +0000 (23 21:42 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 23 Apr 2012 19:42:23 +0000 (23 21:42 +0200)
tree249165ec0bbacb4caddea7181801dab8d3eb49e8
parent687766c9220b367d7fe131cb273a25d4e3ac0231
parent9743a2ca3decf4807b40f6c3702f54cdc9d5f653
Merge branch 'master' of orgmode.org:org-mode