merge
Merge branch '3.3' of git://github.com/pocesar/kohana-modules into pocesar-3.3

Conflicts:
	.gitmodules