Merge branch 'master' of orgmode.org:org-mode
commit9058088652316406c958fe300250387469598a71
authorBastien Guerry <bzg@altern.org>
Thu, 15 Dec 2011 08:28:12 +0000 (15 09:28 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 15 Dec 2011 08:28:12 +0000 (15 09:28 +0100)
treef87be895f2e0c7b8ebcc1227d1b10b700fa485b3
parent5db83d89f05467b887049b79d0cfb7563d64eb91
parent633f2af28e30d28580048e36b860da98d7f64086
Merge branch 'master' of orgmode.org:org-mode