Merge from master

This commit is contained in:
unknown
2014-06-29 10:53:39 +02:00
47 changed files with 327 additions and 391 deletions

View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Sat Jun 28 13:14:17 CEST 2014
build.number=892
#Sun Jun 29 10:53:22 CEST 2014
build.number=893