Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 23 Jan 2013 13:00:03 +0000 (14:00 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 23 Jan 2013 13:00:03 +0000 (14:00 +0100)
commit1e2b26b62a61c43717188b5089ddfbe8369885c6
tree94c6f61efde635c34a07c8536ba76a22134b3aca
parent9d5b79104b3be383d3fb9e685209ece2f619e8c5
parent4a0afac6697f3c3374b343484f36d3186724c19f
Merge branch 'maint'
lisp/ob-python.el