commit
Merge branch 'master' of https://github.com/henno/2013-02-19