dsx
sa
AARGH
asdf
Merge branch 'master' of https://github.com/ratkaisutiimi/kurnu.git

Conflicts:
	wp-content/themes/bones/comments.php
	wp-content/themes/bones/library/translation/fi.po