Timo Westkämper c2d2166644 Merge branch 'master' into i723 ... Conflicts: querydsl-root/pom.xml		2014-05-05 21:39:32 +03:00
..
etc	fixed generic type derivation for subtypes	2010-03-11 18:35:59 +00:00
src	Merge branch 'master' into i723	2014-05-05 21:39:32 +03:00
pom.xml	Bump version	2014-05-02 22:16:20 +03:00
template.mf	Upgrade Morphia dependency #521	2013-10-23 21:07:32 +03:00