Commit 1d37da3392276c16d49a3680e9bd6c22f2c3abd0

Carlos Martín Nieto 2013-10-30T16:25:49

merge: any non-zero return from the user is an error This fixes #1703.