From: Roland Haeder <roland@mxchange.org>
Date: Wed, 7 Oct 2015 06:22:22 +0000 (+0200)
Subject: Merge branch 'master' of file:///E:/Java%20Project/juser-core
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f93f5059f17bb517ac4aca7fedddb14e3279d67f;p=juser-activity-core.git

Merge branch 'master' of file:///E:/Java%20Project/juser-core

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

Conflicts:
	dist.sh
	lib/jcontacts-core.jar
	lib/jcore.jar
	lib/jcoreee.jar
---

f93f5059f17bb517ac4aca7fedddb14e3279d67f