merge back with HEAD for 7.7.0

This commit is contained in:
Colin Kuskie 2009-03-05 16:19:12 +00:00
parent 426bc41b04
commit 04105713f0
23 changed files with 120 additions and 60 deletions

View file

@ -117,6 +117,8 @@ sub upgradeConfigFiles {
print "DONE!\n" unless $quiet;
}
# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
#----------------------------------------------------------------------------