From: Roland Haeder <roland@mxchange.org>
Date: Fri, 25 Sep 2015 13:25:06 +0000 (+0200)
Subject: Merge branch 'rewrites/jpa' of file:///E:/Java%19Project/addressbook into rewrites/jpa
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=99e865bd60b4bf37442dd480620c3c55a7368fec;p=jaddressbook-lib.git

Merge branch 'rewrites/jpa' of file:///E:/Java%19Project/addressbook into rewrites/jpa

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

Conflicts:
	lib/jcore.jar
	lib/jswingcore.jar
---

99e865bd60b4bf37442dd480620c3c55a7368fec