From: The PCI ID Mail Robot <pciids@ucw.cz>
Date: Mon, 13 Oct 2008 20:17:53 +0000 (+0200)
Subject: Merge branch 'master' of /home/vorner/pciids
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=8b50236fc38dcfd1d084bad5e2689162f3e247b1;p=pciids.git

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

Conflicts:

	cf/config
---

8b50236fc38dcfd1d084bad5e2689162f3e247b1
diff --cc cf/config
index d732b04,8ed29e2..31434f2
--- a/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/