Merge branch 'maint' of orgmode.org:org-mode into maint
commit1ec188b00a25ab9c3316b36c6b0da148a4f989ab
authorBastien Guerry <bzg@altern.org>
Tue, 31 Jan 2012 08:27:47 +0000 (31 09:27 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 31 Jan 2012 08:27:47 +0000 (31 09:27 +0100)
treec5ef7c9459a7a242999ecb7be10b773c8e0b9dc0
parentd9ac2ffa37fe0f7f99890c1be565bb223ce50011
parent900b988742f52cf88ae976b89587591a52709a53
Merge branch 'maint' of orgmode.org:org-mode into maint