Merge branch 'master' into maint
commit9167cba3265b7d6f3f9cdd36c1ef62670552ea99
authorBastien Guerry <bzg@gnu.org>
Tue, 3 Jan 2012 08:31:58 +0000 (3 08:31 +0000)
committerBastien Guerry <bzg@gnu.org>
Tue, 3 Jan 2012 08:31:58 +0000 (3 08:31 +0000)
treea852b0f4b346970a80f493e30bb253fc29a7732c
parent926a24aab5963f96f1ce94c9c295e2c7c3273f27
parent8d7aa7dfa87433077d40e2dcab982fb537621e66
Merge branch 'master' into maint
lisp/ob.el