paugre/diaspora — pull request #1 by paugre (2014-08-25 19:21:23+00:00)
Title: rebase babillage develop

rebase