forcomp 2014-06-03 16:45
Merge remote-tracking branch 'origin/master'

Conflicts:
	patmat/.idea/workspace.xml
	patmat/project/project/target/streams/$global/ivy-configuration/$global/out
	patmat/project/project/target/streams/$global/update/$global/out
	patmat/project/target/streams/$global/ivy-configuration/$global/out
	patmat/project/target/streams/$global/update/$global/out
	patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$sbt_2.10/1.0.0/resolved.xml.properties
	patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$sbt_2.10/1.0.0/resolved.xml.xml
	patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$sources_2.10/1.0.0/resolved.xml.properties
	patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$sources_2.10/1.0.0/resolved.xml.xml
	patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$sources_javadoc_2.10/1.0.0/resolved.xml.properties
	patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$sources_javadoc_2.10/1.0.0/resolved.xml.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sbt_2.10-default.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_2.10-default.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-compile-internal.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-compile.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-docs.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-optional.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-plugin.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-pom.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-provided.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-runtime-internal.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-runtime.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-sources.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-test-internal.xml
	patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-test.xml
	patmat/submission/target/streams/$global/update-classifiers/$global/out
	patmat/submission/target/streams/$global/update-sbt-classifiers/$global/out
	patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sbt_2.10/1.0.0/resolved.xml.properties
	patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sbt_2.10/1.0.0/resolved.xml.xml
	patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sources_2.10/1.0.0/resolved.xml.properties
	patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sources_2.10/1.0.0/resolved.xml.xml
	patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sources_javadoc_2.10/1.0.0/resolved.xml.properties
	patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sources_javadoc_2.10/1.0.0/resolved.xml.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sbt_2.10-default.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_2.10-default.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-compile-internal.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-compile.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-docs.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-optional.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-plugin.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-pom.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-provided.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-runtime-internal.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-runtime.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-sources.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-test-internal.xml
	patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sources_javadoc_2.10-test.xml
	patmat/target/streams/$global/update-classifiers/$global/out
	patmat/target/streams/$global/update-sbt-classifiers/$global/out