nothing
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git
nothing
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git
Nothing
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git
nothing
Merge branch 'master' of
https://github.com/genericsystem/genericsystem2011.git

Conflicts:
	genericsystem-impl/src/main/java/org/genericsystem/map/AbstractMapProvider.java
begin getDirectSupers fusion
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git
disable getExtendedDirectSupers temporary