Merge branch 'master' of orgmode.org:org-mode
commit32947c0eed7820892c77834a0de46b5850a71e31
authorBastien Guerry <bzg@altern.org>
Tue, 6 Mar 2012 08:40:22 +0000 (6 09:40 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 6 Mar 2012 08:40:22 +0000 (6 09:40 +0100)
treeda44855354ef31dd323c0f7e084926b7bd675487
parent40bd21611922d130ce02c0e93e6b442c28f8acdf
parentdad33a6b3d447f08423c2ccdca60e20551600f42
Merge branch 'master' of orgmode.org:org-mode