Merge branch '2.9' of github.com:essentials/Essentials into 2.9

This commit is contained in:
KHobbits 2012-08-31 17:48:25 +01:00
commit ff461be45d