Matt 09ee7f3048 Merge remote-tracking branch 'origin/master' ... # Conflicts: # Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java # Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java # Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java # Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java # Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java # Core/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java		2016-03-20 23:03:31 -04:00
..
java/com/plotsquared/sponge	Merge remote-tracking branch 'origin/master'	2016-03-20 23:03:31 -04:00