Merge branch 'master' of orgmode.org:org-mode
commit330257949deae346c284ae361be13f8af8216cf6
authorBastien Guerry <bzg@altern.org>
Mon, 30 Apr 2012 16:30:31 +0000 (30 18:30 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 30 Apr 2012 16:30:31 +0000 (30 18:30 +0200)
treeaab8c761dfa950ff762167eaad35ef486527a841
parent96dd842ee16858a27517000575f23c3649856a4f
parent15315c5cc65b3db9c19bf935952db5fe02aea677
Merge branch 'master' of orgmode.org:org-mode