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

Merge branch 'master' of e:/Java Project/pizzaservice

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

Conflicts:
	PizzaService-ejb/nbproject/build-impl.xml
	PizzaService-ejb/nbproject/genfiles.properties
	PizzaService-ejb/nbproject/project.xml
---

9d6a62d78884f9920b4d5e83a1f4e58de1cd2d39