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

commit ef5e0945bc3dec2320f484547a53a8d4ddc338a9
parent 757ba8baca2da3bb059e04a1bf67e37185dec414
Author: Georges Dupéron <jahvascriptmaniac+github@free.fr>
Date:   Tue, 25 Jan 2011 17:08:14 +0100

Merge branch 'master', remote branch 'origin'

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