Raphael 41d839ecf4 Merge remote branch 'ecleel/master' ... Conflicts: pkg/ubuntu/dist		2010-11-01 15:39:38 -07:00
..
devise	Added missing strings to swedish translation	2010-11-01 16:42:47 +01:00
diaspora	Merge remote branch 'ecleel/master'	2010-11-01 15:39:38 -07:00