z
Merge branch 'master' of github.com:kantoliinary/kantoliina
Merge branch 'master' of github.com:kantoliinary/kantoliina
z
Merge branch 'master' of github.com:kantoliinary/kantoliina
z
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	features/step_definitions/filter_member_steps.rb
z
Merge branch 'master' of github.com:kantoliinary/kantoliina
tekstejä vaihdettu