Merge branch 'master' of orgmode.org:org-mode
commit443398b7669fc586e61687c4b592bcb5198906c3
authorBastien Guerry <bzg@altern.org>
Thu, 17 May 2012 06:16:29 +0000 (17 08:16 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 17 May 2012 06:16:29 +0000 (17 08:16 +0200)
treedc279f25b6622b0c9ce640ee56cc29f0d19852ec
parent872516b8f9378dad95688ec673850163dd824f4d
parenteed31ad9360f2607e5b6b4a8ecce6e6cc745ce71
Merge branch 'master' of orgmode.org:org-mode