Merge branch experimental using --no-ff
authorSebastian Pipping <sebastian@pipping.org>
Wed, 16 Mar 2011 13:48:20 +0000 (14:48 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Wed, 16 Mar 2011 13:48:20 +0000 (14:48 +0100)

Trivial merge