Merge branch 'master' of /home/vorner/pciids

Conflicts:

	cf/config

diff --cc cf/config
index d732b04b4eac22a733c41cf2b45d44882af2f3c2,8ed29e2c62505c5ca23405d4b999037ba29fd463..31434f2fb8ea1a1563df2e1130196cac952632e4
--- 1/cf/config
--- 2/cf/config
+++ b/cf/config
@@@ -1,13 -1,14 +1,14 @@@
 -db = pciids
 -dbuser = pciids
 -dbpasswd = 1234
 -passwdsalt = 1234
 -regmailsalt = 1234
 -authsalt = 1234
 -from_addr = vorner+pciids@ucw.cz
 -sendmail = /home/vorner/bin/sendmail-apache
 -logfile = /home/vorner/prog/pciids/pciids.log
 -hostname = localhost
 -jelnet = /home/vorner/bin/jelnet
 -xmpp_passwd = 1234
 -xmpp_name = none
 +dbname = pciids2
 +dbuser = pciids2
 +dbpasswd = ZaseChciplyKun?
 +passwdsalt = OSNTOomONTHplrchluhcSONUNSt
 +regmailsalt = SNTOHmjsaontmsthoseuhtlrc,'E<<<ua'.LRCHlrchhhewl',rca'a"Hhhhhlr',h
 +authsalt = ANSTHh'othal'cllal"<H>Lsnahtuoesnth'n,.hWLhl'rgp348gSTHl',crnTHOSNTJHSntahOSTHWLRc'h,l.
 +from_addr = PCI ID database <pci-ids+www@ucw.cz>
 +sendmail = /usr/sbin/sendmail
 +logfile = /home/pciids/ids/log/ids.log
 +hostname = pci-ids.ucw.cz
 +jelnet = /home/pciids/ids/perl/scripts/jelnet
 +xmpp_passwd = IorekByrnison
 +xmpp_name = pci-ids@ucw.cz
+ default_uri = PC/