Changes to '2.3-stable'

[Jeroen van Meeuwen]

New branch '2.3-stable' available with the following commits:
commit 6c15376d3dea00e76892deddc1145fee5afe9ab5
Merge: f27ad2f6e05074aeff8efa7953faa88a85a90f39 5da8d50314070c63258e9109ab87ed4c44db151a
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 11:58:04 2010 +0200

    remerge refactor-kolabd (including recorded renames)

commit 5da8d50314070c63258e9109ab87ed4c44db151a
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 11:56:23 2010 +0200

    merge refactor-kolabd (including recorded renames) with old branch

commit f27ad2f6e05074aeff8efa7953faa88a85a90f39
Merge: a5cbbaccee8469071db1ed52144bccc9ce93e664 754e830b715a3a1e4faa277ef0a0a523d84804c2
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 10:54:30 2010 +0200

    merge heads

commit a5cbbaccee8469071db1ed52144bccc9ce93e664
Merge: 31787fd53afdc1d79f013abce34b53c91c9c0ea4 9636d5ebf743b1fc6b33e6428e563193bf9e6f7b
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 10:52:49 2010 +0200

    Dummy merge: Mark 2.2-stable as merged into default up to point of migration
    
    Development in the Mercurial repository started after b291c29ca994 (for
    default) and 82733a4020a0 (for 2.2-stable). There are still some changesets
    in the 2.2-stable branch that need to be ported to default, this can be
    determined by comparing release-notes.txt.

commit 754e830b715a3a1e4faa277ef0a0a523d84804c2
Merge: 9f645eec8696cf05572f42f36d96caee10bbee02 e949e1b27e4b3dddfd563b6952761acb55f9aedc
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Thu Sep 23 20:26:45 2010 +0200

    Merged refactor-kolabd.

commit 9f645eec8696cf05572f42f36d96caee10bbee02
Merge: e949e1b27e4b3dddfd563b6952761acb55f9aedc d68d0552fa3229c4bdd6d66d2b1821d607854380
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Thu Sep 23 20:26:26 2010 +0200

    Merged refactor-kolab-webadmin.

commit e949e1b27e4b3dddfd563b6952761acb55f9aedc
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Sep 14 16:14:07 2010 +0200

    Merge with remote fix.

commit 86a305d2bb9de5bdef0af25e3cd2ef6cce08ca4b
Merge: 31787fd53afdc1d79f013abce34b53c91c9c0ea4 d68d0552fa3229c4bdd6d66d2b1821d607854380
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Sep 13 11:34:38 2010 +0200

    Merged branch 'default'

commit d68d0552fa3229c4bdd6d66d2b1821d607854380
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Sep 13 10:55:04 2010 +0200

    Merge

commit 31787fd53afdc1d79f013abce34b53c91c9c0ea4
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Sat Jul 17 15:59:27 2010 +0200

    kolab/issue3245 (Remove horde.schema and rfc2739.schema from kolab-server/slapd.conf.template)

commit 0a616a7348f337a63ce01b104d425f3d7f793f6b
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Wed Jul 8 12:26:06 2009 +0200

    Fix broken commits on the kolab schema.

commit 3f0004bb8131aef565fec806d0779432c9c8dd8f
Author: Martin Konold <martin.konold at erfrakon.de>
Date:   Mon Jun 22 15:18:42 2009 +0200

    Martin Konold: Added new attribute which contains a comma separated list of secure ciphers. (Required for SSL/TLS)

commit 82ed400fb486b5e1b180ccdde6bd2baa5596ecec
Author: Martin Konold <martin.konold at erfrakon.de>
Date:   Fri Jun 5 16:14:05 2009 +0200

    MArtin Konold: Added many new attributes and objectclasses for future use. (ob derived stuff)

commit dd4f409171ee4a04bdcade8dac5902a0651f265a
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Apr 26 15:03:31 2009 +0200

    *** empty log message ***