Spaceghost/githerp — pull request #2 by Spaceghost (2012-11-15 22:01:10+00:00)
Title: Trying merge with no-ff

Let's see how this goes.

@joonas