# HG changeset patch
# User Dan
# Date 1192931936 14400
# Node ID 54b3e14bf19d1c0abb31366e53596885bdd70e76
# Parent  eec079676fe77b8d5a6e90de63cc49986ceea58e# Parent  9b4279c25d33b1108621a48320e367c8685fe9fa
Merging in changes from 9b4279c25d33

diff -r eec079676fe7 -r 54b3e14bf19d .hgtags
diff -r eec079676fe7 -r 54b3e14bf19d install.php
diff -r eec079676fe7 -r 54b3e14bf19d schema.sql
diff -r eec079676fe7 -r 54b3e14bf19d upgrade.php
diff -r eec079676fe7 -r 54b3e14bf19d upgrade.sql