Timo Westkämper 388be85cfc Merge branch 'master' into db2-support ... Conflicts: querydsl-sql/src/test/java/com/mysema/query/SelectBase.java		2014-12-18 23:42:00 +02:00
..
main/java/com/mysema	Merge pull request #1085 from querydsl/template_default_instance	2014-12-15 22:21:54 +02:00
test	Merge branch 'master' into db2-support	2014-12-18 23:42:00 +02:00