Dan Hansen & Sarah Mei 82e2f23f91 Merge branch 'master' of github.com:diaspora/diaspora		2010-12-15 14:29:33 -05:00
..
devise	pulled locals from 99translations	2010-12-13 16:20:05 +01:00
diaspora	Merge branch 'master' of github.com:diaspora/diaspora	2010-12-15 14:29:33 -05:00
rails-i18n	forgot to add a new file	2010-12-13 15:19:16 +01:00