Merge branch 'origin-maint'
commit8bce3b7ec3f3fe089031f59f8ace79a2432ce8ae
authorEric Schulte <eric.schulte@gmx.com>
Tue, 10 Jan 2012 16:46:17 +0000 (10 09:46 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Tue, 10 Jan 2012 16:46:17 +0000 (10 09:46 -0700)
tree6b61d1d303f8e035b98887304c1159ba2232f5ad
parent73b67cd8a5b036f12efb489c3f9838c9a547a504
parentbebf66c652d561868c0d59b6dd36757bf12060ec
Merge branch 'origin-maint'
doc/org.texi