Merge branch 'origin-maint'
commitfce92180d162c2c2d4487a719c078c5b33f941b3
authorEric Schulte <eric.schulte@gmx.com>
Tue, 24 Jan 2012 02:43:28 +0000 (23 19:43 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Tue, 24 Jan 2012 02:43:28 +0000 (23 19:43 -0700)
tree8458da6f30acdefbcf850aa29bd7b1741514570f
parent10b06ae53cb29f2eedd9a2db405ca6084a8377b2
parent269a509615095e2e2d271a9e33d799d41744047a
Merge branch 'origin-maint'
doc/org.texi
lisp/ob.el