Merge branch 'develop' into debian-develop

[archipelago] / Changelog

diff --git a/xseg/sys/user/python/xseg/__init__.py b/Changelog
similarity index 100%
rename from xseg/sys/user/python/xseg/__init__.py
rename to Changelog