Revert "Merge branch 'master' of git://github.com/proppy/windmill"
Revert "Merge branch 'master' of git://github.com/proppy/windmill"

This reverts commit 2d51fffb089de2d8cb290b58ef032d85d2bb4f9b, reversing
changes made to 34f4d4057253990e4cd4239de6567594856ea5d1.

windmill/windmill,windmill/windmill,windmill/windmill,windmill/windmill,windmill/windmill,windmill/windmill