From: Roland Haeder <roland@mxchange.org>
Date: Fri, 2 Oct 2015 07:00:51 +0000 (+0200)
Subject: Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice-lib
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7f02927b4cddce9cfcf6bd49b8b0532c82d93f06;p=pizzaservice-lib.git

Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice-lib

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

Conflicts:
	lib/jcore.jar
	lib/jshop-core.jar
---

7f02927b4cddce9cfcf6bd49b8b0532c82d93f06