modified:   src/libgcm/util/ThirdDegreePolynomial.cpp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/libgcm/util/ThirdDegreePolynomial.cpp
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/libgcm/util/ThirdDegreePolynomial.cpp
14.06
Merge remote-tracking branch 'upstream/master'
14.0614.0614.0614.0614.0614.06
	new file:   tasks/tests/plastic-adhesion-contact-test.xml
Added steel2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tasks/tests/basic-plastic-wave-cubic-mesh.xml
	modified:   tasks/tests/plastic-adhesion-contact-test-tetr.xml
Merge remote-tracking branch 'upstream/master'
	modified:   tasks/tests/crack.xml
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/libgcm/util/ThirdDegreePolynomial.cpp
	tasks/tests/crack.xml
	modified:   tasks/tests/crack.xml
Minor fixes to merge fb2c1630b850c98df3092a7b34aedd78d4ce6169 correctly
Explicitly specified gcm::real type to get rid of ambiguity
Save information about written snapshots to text file
Do not print extra new line when detecting boost library
Merge branch 'master' of github.com:avasyukov/gcm-3d