Merge branch 'maint' of orgmode.org:org-mode into maint
authorBastien Guerry <bzg@altern.org>
Tue, 31 Jan 2012 23:10:06 +0000 (00:10 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 31 Jan 2012 23:10:06 +0000 (00:10 +0100)
commit04ecf18db0de904dd966318c9bfe89c94b058054
tree146942fe590e6c733bafa4e57a0365438a43c152
parent1ec188b00a25ab9c3316b36c6b0da148a4f989ab
parent182970cf8e680943483fcece79d17070b783bb72
Merge branch 'maint' of orgmode.org:org-mode into maint