1
2
3
Merge branch 'topic-slowacki'
1
2
3
Merge branch 'topic-slowacki'
1
2
Merge branch 'ts'
Merge branch 'master' into beta

Conflicts:
	juliusz-slowacki/hymn.txt
Ver. 0.8.0