Merge branch 'stats2.0'

Conflicts:
	.build.number

Merged stats2.0 into master.
This commit is contained in:
Pascal Koenig
2012-02-03 17:00:55 +01:00
38 changed files with 627 additions and 377 deletions

View File

@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Tue Oct 04 10:45:18 CEST 2011
build.number=53
#Fri Feb 03 16:29:04 CET 2012
build.number=72