From: pinene <epinzolas001@ikasle.ehu.eus>
Date: Wed, 20 May 2015 16:42:17 +0000 (+0200)
Subject: Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code
X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/commitdiff_plain/ccac9974c8183f7f0d30e8cabd84ee0386e8cd97?hp=ccac9974c8183f7f0d30e8cabd84ee0386e8cd97

Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code

Conflicts:
	ruralHouses client/src/domain/Owner.java
	ruralHouses client/src/domain/RuralHouse.java
	ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java
	ruralHouses client/src/gui/ModifyOfferGUI.java
	ruralHouses/src/dataAccess/DB4oManager.java
	ruralHouses/src/domain/Booking.java
---