Fabian Märki 0b41016535 Merge branch 'master' into ATEST-246 ...

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java

2015-10-30 11:46:30 +01:00

..

gradle

ATEST-74:

2015-06-10 14:18:37 +02:00

org.eclipse.jdt.core.prefs

Merge branch 'master' into ATEST-246

2015-10-30 11:46:30 +01:00