di7chro d0bdcbf911 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	PokerKata/src/session3/PokerGame.java

2015-04-27 13:53:18 +02:00

..

org.eclipse.jdt.core.prefs

Merge remote-tracking branch 'origin/master'

2015-04-27 13:53:18 +02:00