hank789/diaspora — pull request #2 by hank789 (2014-04-13 15:55:37+00:00)
Title: merge

merge