diaspora/diaspora — comment on commit 96ff61743eb031bfacfde0a8d389e9c90e043ab9
File:  line 0
By danielgrippi:

is this now merge-able?