Jonathan Williams 9bc9cc2bb8 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_Helmet.java Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ArmorGadget.java Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/Gadget.java Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java		2013-10-26 08:53:38 -05:00
..
mineplex/hub	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex	2013-10-26 08:53:38 -05:00