	Merge branch 'master' of gitorious.org:vinsdeloire/vinsdeloire
	Merge branch 'master' of gitorious.org:vinsdeloire/vinsdeloire

24eme/vinsdeloire,24eme/vinsdeloire,24eme/vinsdeloire,24eme/vinsdeloire,24eme/vinsdeloire,24eme/vinsdeloire