papymojo/h14equipe2 — pull request #9 by emilieproteau (2014-03-06 21:53:28+00:00)
Title: Merge remote-tracking branch 'origin/master'

Conflicts:
ajouterProduit.php
iframepanel.php