diaspora/diaspora — pull request #2667 by MrZYX (2012-01-15 01:52:32+00:00)
Title: set faradays timeout to 25 seconds

As suggested in #2590
I agree that 5 seconds isn't enough, we need to gather some experience on what's the best value. Lets try how 25 works for the beginning.
Thoughts?