bidule
Merge branch 'master' of github.com:Elarnon/north-american-octo-wight
ok
Conflicts:
	routage/diaspora.py