MP2E/Wadgen — pull request #3 by Gio (2013-11-27 18:06:44+00:00)
Title: Pushing manual merges upstream

Note the only real change is the AUTHORS file; the other two were me having uncommitted changes. Please check the AUTHORS file and specify what bugfixes were contributed