Merge branch 'experimental' using --no-ff
authorSebastian Pipping <sebastian@pipping.org>
Sun, 23 Jan 2011 18:04:24 +0000 (19:04 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Sun, 23 Jan 2011 18:04:55 +0000 (19:04 +0100)

Trivial merge