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

commit f914ed3bf61f016bb7348563c1030a737e43b3e0
parent 2e3ce256f3d339a75827c9238887f61c520e012f
Author: Georges Dupéron <jahvascriptmaniac+github@free.fr>
Date:   Sat,  6 Nov 2010 01:33:46 +0100

Merge branch 'master', remote branch 'origin'

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