Raphael 7244730961 Merge remote branch 'ed0h/fr-update' ... Conflicts: pkg/ubuntu/dist		2010-11-01 17:36:05 -07:00
..
devise	Merge remote branch 'ed0h/fr-update'	2010-11-01 17:36:05 -07:00
diaspora	Merge remote branch 'ed0h/fr-update'	2010-11-01 17:36:05 -07:00