Shahor/testRebase — pull request #2 by Shahorplop (2013-05-20 19:05:59+00:00)
Title: new test, with --no-ff this time

jj:x