qolami/playground — pull request #3 by hql (2012-12-22 14:29:48+00:00)
Title: final change by a contributor

using `git merge --no-ff` instead of `git rebase`