wpmu bugs
Merge pull
Revert "Merge pull"

This reverts commit 48a38028936264db6c9a26863bb15705b4c5c8f2.
Merge branch 'debugon' of git://github.com/hacklabr/delibera into hacklabr-debugon

Conflicts:
	src/delibera.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/delibera.php