# HG changeset patch
# User Dan
# Date 1191194524 14400
# Node ID 9b4279c25d33b1108621a48320e367c8685fe9fa
# Parent  824821224153a95476eb5ca161e9e682db9645c0# Parent  134ed87c8950addb1c457140a441869daee3d68d
Merging branches from Scribus and Nighthawk

diff -r 824821224153 -r 9b4279c25d33 .hgtags
diff -r 824821224153 -r 9b4279c25d33 install.php
diff -r 824821224153 -r 9b4279c25d33 schema.sql
diff -r 824821224153 -r 9b4279c25d33 upgrade.php
diff -r 824821224153 -r 9b4279c25d33 upgrade.sql