fix oauth keys, deep_merge vs deep_merge! my bad
fix oauth keys, deep_merge vs deep_merge! my bad

jhass/diaspora,Flaburgan/diaspora,Amadren/diaspora,spixi/diaspora,despora/diaspora,Muhannes/diaspora,SuperTux88/diaspora,Muhannes/diaspora,KentShikama/diaspora,Flaburgan/diaspora,despora/diaspora,jhass/diaspora,KentShikama/diaspora,SuperTux88/diaspora,SuperTux88/diaspora,spixi/diaspora,SuperTux88/diaspora,jhass/diaspora,geraspora/diaspora,geraspora/diaspora,despora/diaspora,diaspora/diaspora,Flaburgan/diaspora,spixi/diaspora,jhass/diaspora,diaspora/diaspora,Muhannes/diaspora,Amadren/diaspora,Amadren/diaspora,diaspora/diaspora,Muhannes/diaspora,geraspora/diaspora,geraspora/diaspora,KentShikama/diaspora,despora/diaspora,Amadren/diaspora,Flaburgan/diaspora,spixi/diaspora,KentShikama/diaspora,diaspora/diaspora