Merge branch 'master' of orgmode.org:org-mode
commitb2e1d6d2bfb44f33b2fba613cda1329c4daaac96
authorBastien Guerry <bzg@altern.org>
Thu, 7 Mar 2013 15:31:40 +0000 (7 16:31 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 7 Mar 2013 15:31:40 +0000 (7 16:31 +0100)
treec33e2f0e49fe796b00fc9f5ba021d0472c0417d9
parent81d0b52f13376dff23db7522b049ed0f52d776b9
parent3b0e662181c8494180c1cdaa9c2a1397562f7067
Merge branch 'master' of orgmode.org:org-mode