redo [1]
Merge branch 'master' of https://github.com/matthieugomez/IRkernel

Conflicts:
	R/execution.r
execution