Merge remote-tracking branch 'lucas/Code injection in debugger'
authorJean Privat <jean@pryen.org>
Mon, 20 Jan 2014 14:48:46 +0000 (09:48 -0500)
committerJean Privat <jean@pryen.org>
Mon, 20 Jan 2014 14:48:46 +0000 (09:48 -0500)

Trivial merge