Raphael c1c631d5ed Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg ... Conflicts: config/locales/diaspora/en.yml		2010-11-04 18:56:43 -07:00
..
devise	updated german locale so no keys are missing (informal)	2010-11-02 12:12:47 -07:00
diaspora	Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg	2010-11-04 18:56:43 -07:00