From: Roland Haeder <roland@mxchange.org>
Date: Thu, 20 Aug 2015 15:21:06 +0000 (+0200)
Subject: Merge branch 'master' of /media/quix0r/stick/Java Project/jcore
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=699cfd7041713a80248322ac911b4c02bd3a14d5;p=jcore.git

Merge branch 'master' of /media/quix0r/stick/Java Project/jcore

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	src/org/mxchange/jcore/database/backend/datasource/DataSourceDatabaseBackend.java
Signed-off-by:Roland Häder <roland@mxchange.org>
---

699cfd7041713a80248322ac911b4c02bd3a14d5