Merge branch 'experimental' using --no-ff
authorSebastian Pipping <sebastian@pipping.org>
Sun, 30 Jan 2011 22:28:07 +0000 (23:28 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Sun, 30 Jan 2011 22:28:24 +0000 (23:28 +0100)
commitb05480c4879b14fc8cb6a6af37b7b8b818077511
tree3b68154f1b579b38eb2d2640a4e7f7a068c70e32
parentff1f87e88f1c85c3bbb9c3ca358a243e2da350a7
parent8a8d49167e37b14b7bba57feb8dd7bd452ee2129
Merge branch 'experimental' using --no-ff