tree cad9c090eeed4625d039585e65c30e6285217451
parent e689d11c9e09ffaaaf5e9406a420e2e293b77bbf
parent aa7c4ae24678b05c150d78f6cca314aa650221d3
author Michal Vasko <mvasko@cesnet.cz> 1464942540 +0200
committer Michal Vasko <mvasko@cesnet.cz> 1464942540 +0200

Merge branch 'devel'

Conflicts:
	CMakeLists.txt