From 8237bd52b56f42b61b603f04d437e85abc4cd0f5 Mon Sep 17 00:00:00 2001
From: Glitchfinder <glitchkey@gmail.com>
Date: Tue, 25 Dec 2012 21:00:44 -0800
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'mcmmo/master'