querydsl/querydsl-sql/src/test
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
..
java/com Merge branch 'master' into db2-support 2014-12-18 23:42:00 +02:00
resources Adjust the log pattern to use MDC 2014-11-28 19:03:59 +01:00