mcMMO-Dev/mcMMO — pull request #322 by Glitchfinder (2012-11-21 21:49:49+00:00)
Title: Resolving merge conflict with Advanced Config

This should resolve the merge conflict with the advanced configuration in the recent pull request.