Nadrin/mcproxy — pull request #3 by DylanLukes (2011-10-14 17:39:16+00:00)
Title: My Edits

They should merge cleanly.