Merge branch 'master' of github.com:guard/guard

Conflicts:
	README.md
This commit is contained in:
Rémy Coutable 2011-05-28 19:39:48 +02:00
commit 96e7c43d25

Diff Content Not Available