Merge branch 'experimental' using --no-ff
authorSebastian Pipping <sebastian@pipping.org>
Sun, 23 Jan 2011 18:04:24 +0000 (19:04 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Sun, 23 Jan 2011 18:04:55 +0000 (19:04 +0100)
commit56af6325067b92c1848a505ab76ea5dfa1045b15
treed8f769b7721d8c1584dc40b546ec7fc84cfbb63d
parent64c32a94bd538c08b1e741f543cc8fcd9b0391ed
parent7d5ba3ef26e2d299f618f1d94201e5baab3fab28
Merge branch 'experimental' using --no-ff