Merge branch 'experimental' using --no-ff
authorSebastian Pipping <sebastian@pipping.org>
Thu, 10 Feb 2011 17:13:26 +0000 (18:13 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Thu, 10 Feb 2011 17:13:26 +0000 (18:13 +0100)
commit06d136ca6a5c8dc23ff0b50e6f10771ac0482730
tree1aca97d540ef9060876fa01ecbfa0a5f0b13b261
parent734bbf97f4dda5e1bc4d427c24cb53be607509e3
parent107049cad2ad3ebbd4b60556e3bbe85b16b1c13c
Merge branch 'experimental' using --no-ff