Merge branch 'origin-maint'
commitdad33a6b3d447f08423c2ccdca60e20551600f42
authorEric Schulte <eric.schulte@gmx.com>
Mon, 5 Mar 2012 21:55:05 +0000 (5 14:55 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Mon, 5 Mar 2012 21:55:05 +0000 (5 14:55 -0700)
treeda44855354ef31dd323c0f7e084926b7bd675487
parent93ad1e4c9a4cecc0ec4121fbac74a4bc5ce6ca6e
parent9371465aabaf10fe948f4bf2e4f107a18eb958d5
Merge branch 'origin-maint'
doc/org.texi