f
j:x
Merge branch 'master' of https://github.com/tmedford/cancan_namespace

Conflicts:
	cancan_namespace.gemspec