diaspora/diaspora — pull request #3376 by stevenh512 (2012-06-13 13:26:45+00:00)
Title: Update Rails to 3.2.6

Let's see what Travis says. :)

(note: Rails core team recommends upgrading immediately, if Travis is happy I'll merge this)