From: Roland Haeder <roland@mxchange.org>
Date: Tue, 13 Oct 2015 13:33:47 +0000 (+0200)
Subject: Merge branch 'master' of file:///E:/Java%20Project/addressbook-lib
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=85dfaa739579a63b610c48467352af43e12e6e76;p=jaddressbook-lib.git

Merge branch 'master' of file:///E:/Java%20Project/addressbook-lib

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

Conflicts:
	src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
	src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
---

85dfaa739579a63b610c48467352af43e12e6e76