Merge branch 'hotfix/0.7.1.7' into develop

author Johan Cwiklinski <johan@x-tnd.be>

Thu, 18 Oct 2012 17:49:40 +0000 (19:49 +0200)

committer Johan Cwiklinski <johan@x-tnd.be>

Thu, 18 Oct 2012 17:49:40 +0000 (19:49 +0200)
author Johan Cwiklinski <johan@x-tnd.be>
Thu, 18 Oct 2012 17:49:40 +0000 (19:49 +0200)
committer Johan Cwiklinski <johan@x-tnd.be>
Thu, 18 Oct 2012 17:49:40 +0000 (19:49 +0200)
diff --cc galette/includes/galette.inc.php
Simple merge
diff --cc galette/lib/Galette/Entity/Adherent.php
Simple merge
diff --cc galette/templates/default/ie.css
Simple merge
author	Johan Cwiklinski <johan@x-tnd.be>
	Thu, 18 Oct 2012 17:49:40 +0000 (19:49 +0200)
committer	Johan Cwiklinski <johan@x-tnd.be>
	Thu, 18 Oct 2012 17:49:40 +0000 (19:49 +0200)
		1	2
galette/includes/galette.inc.php	patch \|	diff1 \|	diff2 \|	blob \| history
galette/lib/Galette/Entity/Adherent.php	patch \|	diff1 \|	diff2 \|	blob \| history
galette/templates/default/ie.css	patch \|	diff1 \|	diff2 \|	blob \| history