Ilkka Seppala 30bc25b5bf Merge branch 'master' of https://github.com/fluxw42/java-design-patterns into fluxw42-master ...

Conflicts:
	monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java

2015-12-26 12:36:38 +02:00

..

main/java/com/iluwatar/monostate

Merge branch 'master' of https://github.com/fluxw42/java-design-patterns into fluxw42-master

2015-12-26 12:36:38 +02:00

test/java/com/iluwatar/monostate

Fixed failing unit test

2015-12-21 14:35:36 +01:00