diaspora/diaspora — comment on commit edd4352e496b8ed39200f8d11dfc648d51ab815d
File:  line 0
By Pistos:

It was probably not necessary to merge this (after all our work over the past few days), but it's not harmful to have it in there.