Merge branch 'origin-maint'
commit15d2a7f3d4f439ac4fb7b380a8c2c19a1b6a9360
authorEric Schulte <eric.schulte@gmx.com>
Fri, 2 Mar 2012 19:37:30 +0000 (2 12:37 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Fri, 2 Mar 2012 19:37:30 +0000 (2 12:37 -0700)
tree4283442128a1d133dcb3d58de3b5e6490743d482
parent144606dbaf3d747652ad24dce39afcafabba0d6b
parent000afe01abbd3b8b3416a12a91e33f8e9f51b9a1
Merge branch 'origin-maint'
doc/org.texi