Merge branch 'master', remote branch 'origin' - www - Unnamed repository; edit this file 'description' to name the repository.

commit 978e0ee4296fd57f4fc32bda922f1f0ac3d6075b
parent 8737a1c6446bf997a301d7eed79510154a355a84
Author: Georges Dupéron <jahvascriptmaniac+github@free.fr>
Date:   Tue,  1 Feb 2011 14:44:31 +0100

Merge branch 'master', remote branch 'origin'

	www Unnamed repository; edit this file 'description' to name the repository.
	Log \| Files \| Refs