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

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

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

Conflicts:
	lib/jcore.jar
---

afd2dcd1f7511cd5981dfdcbce625ea5bad9e6e4