Merge branch 'experimental' using --no-ff
authorSebastian Pipping <sebastian@pipping.org>
Sun, 30 Jan 2011 22:28:07 +0000 (23:28 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Sun, 30 Jan 2011 22:28:24 +0000 (23:28 +0100)

Trivial merge