3 commits

Author	SHA1	Message	Date
Colin Kuskie	ca9a3bd6c7	Merge branch 'master' into WebGUI8, up to 7.9.10. Some tests failing due to changes in default content.	2010-07-27 22:55:57 -07:00
Colin Kuskie	ad6cd0526c	Refix the upgrade version.	2010-07-15 14:39:48 -07:00
Colin Kuskie	607218880e	Remove upgrade files in wrong location. Update upgrade directory to 8.	2010-07-15 14:34:46 -07:00