Raphael 0831812e97 Merge remote branch 'kashif/master'		2010-10-07 10:41:50 -07:00
..
devise	Merge remote branch 'kashif/master'	2010-10-07 10:41:50 -07:00
diaspora	Merge remote branch 'kashif/master'	2010-10-07 10:41:50 -07:00