Merge branch 'origin-maint'
commit742c4e976b489128081aec7b7d2c3adbd99d71ab
authorEric Schulte <eric.schulte@gmx.com>
Fri, 27 Jan 2012 23:31:11 +0000 (27 16:31 -0700)
committerEric Schulte <eric.schulte@gmx.com>
Fri, 27 Jan 2012 23:31:11 +0000 (27 16:31 -0700)
tree4b19052d14a1df9e67a22e3d5351b8119e03f96b
parent25019d8147cc62409c2789526330c64ff4528d61
parent843ac278f911e0a017356d570a4f31ded172fe49
Merge branch 'origin-maint'
lisp/ob-exp.el
lisp/ob.el