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,5 +1,5 @@
#Wed, 21 Aug 2013 19:57:49 -0400
#Thu, 22 Aug 2013 17:08:21 -0400
program.VERSION=3.1
program.BUILDNUM=473
program.BUILDDATE=08/21/2013 07\:57 PM
program.BUILDNUM=475
program.BUILDDATE=08/22/2013 05\:08 PM