Merge branch 'master' of github.com:bbatsov/prelude

This commit is contained in:
Bozhidar Batsov 2012-05-01 15:27:17 +03:00
commit c57a69f17b