From: Sébastien CHAZALLET <s.chazallet@gmail.com>
Date: Fri, 16 Nov 2012 10:26:40 +0000 (+0100)
Subject: Merge branch 'master' of ../application-blanche
X-Git-Url: http://git.inspyration.org/?p=zf2.biz%2Fgalerie.git;a=commitdiff_plain;h=454bf7af93d10f149efd4b58091b9fa4a19605ae

Merge branch 'master' of ../application-blanche

Conflicts:
	vendor/zf2biz/Custom/Model/Entity.php
---

454bf7af93d10f149efd4b58091b9fa4a19605ae