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)

Trivial merge