labelit lisätty
z
Merge branch 'master' of github.com:kantoliinary/kantoliina
z
Merge branch 'master' of github.com:kantoliinary/kantoliina
more rdoc
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/views/mailer/index.html.haml