From: Roland Haeder <roland@mxchange.org>
Date: Fri, 2 Oct 2015 06:51:14 +0000 (+0200)
Subject: Merge branch 'rewrites/jpa' of e:/Java Project/jshop-core
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=779fcac1b80c49247da82c5dfae0da2337aa8c98;p=jshop-core.git

Merge branch 'rewrites/jpa' of e:/Java Project/jshop-core

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

Conflicts:
	lib/jcore.jar
---

779fcac1b80c49247da82c5dfae0da2337aa8c98