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

Conflicts:
	app/views/members/edit.html.haml
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/views/members/edit.html.haml