[MERGE] solve conflict
[odoo/odoo.git] / bin / server.pkey
2010-11-23 P. Christeassetup: The ssl certs should *not* be distributed.
2006-12-07 pinkyNew trunk