Merge pull request #3 from garzgul/master

mise a jour lundi 08/09
livreGestion en maj ter...
livreGestion en maj ter...
08092014 - 14h55
08092014 - 14h55
Merge origin/master
Merge pull request #4 from garzgul/Gael

Merge pull request #3 from garzgul/master
Merge pull request #5 from garzgul/master

mise a jour lundi 08/09
Merge pull request #6 from garzgul/master

mise a jour lundi 08/09
Merge branch 'master' into Eddy

Conflicts:
	src/java/DAO/livre/AuteurDAO.java
Merge pull request #8 from garzgul/Eddy

Eddy
livreGestion en maj ter...
Merge origin/master into Eddy