Merge branch 'bsonlobby' into master

Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj

Author: Rene Jochum

3rdparty/bson/Makefile.am

@@ -0,0 +1,13 @@
+AM_CPPFLAGS = -DSTATICLIB $(WZ_CPPFLAGS)
+AM_CFLAGS = -DSTATICLIB $(WZ_CFLAGS)
+
+noinst_LIBRARIES = libbson.a
+
+noinst_HEADERS = \
+	bson.h \
+	platform_hacks.h
+	
+libbson_a_SOURCES = \
+	bson.c \
+	numbers.c
+