Conflicts: mcproxy/Makefile mcproxy/files/mcproxy.conf mcproxy/files/mcproxy.init
This reverts commit 4fd7d28f62.
4fd7d28f62