Merge branch 'easyconfigs-it4i-salomon'

This commit is contained in:
Lukáš Krupčík 2017-06-12 10:19:28 +02:00
commit b7135c6c4e