Merge branch 'master' into adminworld

Conflicts:
	appinfo.properties
	buildnumber.properties
This commit is contained in:
Steven Lawson
2013-08-22 17:08:52 -04:00
3 changed files with 42 additions and 27 deletions

View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Wed Aug 21 19:57:49 EDT 2013
build.number=474
#Thu Aug 22 17:08:21 EDT 2013
build.number=476