Merge branch 'bug-314575' using --no-ff
authorSebastian Pipping <sebastian@pipping.org>
Tue, 8 Feb 2011 17:01:11 +0000 (18:01 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Tue, 8 Feb 2011 17:01:11 +0000 (18:01 +0100)
commit8097ea8d4c74ff47be2e07efe1b3a45d8871f834
tree6f001796b55603c091098b460f7016e30d52fc7f
parent23fd924325de6c9ffd0fbfbbff8da67bbf68a0ea
parent79f6c2533d9719063acb8e217beb91237f7279bb
Merge branch 'bug-314575' using --no-ff