Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Thu, 25 Apr 2013 05:30:19 +0000 (07:30 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 25 Apr 2013 05:30:19 +0000 (07:30 +0200)
1  2 
lisp/ob-core.el

diff --cc lisp/ob-core.el
Simple merge