diaspora c++
Merge branch 'master' of github.com:Elarnon/north-american-octo-wight
ok
diaspora adaptated ?
Merge branch 'master' of github.com:Elarnon/north-american-octo-wight
ok
diaspora compile
Merge branch 'master' of github.com:Elarnon/north-american-octo-wight
ok
diaspora floyd added
Merge branch 'master' of github.com:Elarnon/north-american-octo-wight
ok