maelsoucaze 294c8849b9 Merge remote branch 'upstream/master' into fr-locales		2010-10-25 00:04:24 +02:00
..
devise	Merge remote branch 'maelsoucaze/fr-locales'	2010-10-14 17:43:27 -07:00
diaspora	Merge remote branch 'upstream/master' into fr-locales	2010-10-25 00:04:24 +02:00