7.1
Merge branch 'master' of github.com:alexey-pankratyev/skate

Conflicts:
	webrat.log