Merge branch 'origin-maint'
commit59df6a9ba071ae3d6e057ecc398b45fb771094eb
authorEric Schulte <eric.schulte@gmx.com>
Sun, 8 Jan 2012 16:16:42 +0000 (8 09:16 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Sun, 8 Jan 2012 16:16:42 +0000 (8 09:16 -0700)
treeaf52a25252e0dc06d399f16f28b837aa54900b5c
parent3638097e5a4dfdba44dea05de8ea711bdea802db
parenta57f228a1c82b12fae2c266b7c0678a486034278
Merge branch 'origin-maint'
doc/org.texi