Commit eb3d9161 authored May 05, 2016 by Tomáš Oberhuber

Merge branch 'master' into develop

Conflicts:
	src/solvers/tnlBuildConfigTags.h

There are no changes