FrozenCow 1cc43637ee Merge remote-tracking branch 'kilandor/master' into nowebserver ... Conflicts: configuration.txt src/main/java/org/dynmap/DynmapPlayerListener.java src/main/java/org/dynmap/DynmapPlugin.java web/map.js		2011-02-22 17:58:39 +01:00
..
main	Merge remote-tracking branch 'kilandor/master' into nowebserver	2011-02-22 17:58:39 +01:00