lefnire/habitrpg — pull request #310 by SlappyBag (2013-02-05 12:32:17+00:00)
Title: #236 & #291

Should work... I need to get round to installing locally to properly test but hey ho!

#236
#291