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)

Trivial merge