Merge branch 'origin-hotfix-7.8.06'
commita4efcc3a3908801ab07a301bb9df6e555d8c6e2e
authorEric Schulte <eric.schulte@gmx.com>
Tue, 27 Mar 2012 11:12:17 +0000 (27 07:12 -0400)
committerEric Schulte <eric.schulte@gmx.com>
Tue, 27 Mar 2012 11:12:17 +0000 (27 07:12 -0400)
tree03e5fbd7b379ead9a020719f30cd9152bf6e7ef3
parent3d5a3474ca873a5b4b5a86fe7ed6495708f82ecd
parentdbe4bf805f3a50f0c47036e556606de1366a947a
Merge branch 'origin-hotfix-7.8.06'
lisp/ob.el
testing/lisp/test-ob.el