new file:   cjob.txt
	new file:   config
	new file:   exportdb
	new file:   helpgit
	new file:   jenkins/config.xml
	modified:   loaddump
	new file:   loaddump_full
	modified:   packconf
	modified:   packdata
	modified:   packdoc
	modified:   packear
	new file:   packlivraison
	new file:   packreprise
	modified:   packtalend
	new file:   sproxy
	new file:   uproxy
Merge branch 'master' of https://github.com/bennekrouf/mas

Conflicts:
	exportdb
	loaddump
	packdata
	packear
	packlivraison
	packreprise

	modified:   addprojecttorepo
	modified:   addsvnrepo
	modified:   addsvnuser
	modified:   cpconf
	modified:   cpear
	modified:   cplivraison
	modified:   cpsouche
	modified:   depinteg
	modified:   exportdb
	modified:   loaddump
	modified:   openport
	modified:   packconf
	modified:   packdata
	modified:   packdoc
	modified:   packear
	modified:   packtalend
	modified:   restorefirewallu
	modified:   sazure
	modified:   sinteg
	modified:   stools
	modified:   stopfirewallu
	deleted:    tmp