3 commits - configure.ac share/templates

[Jeroen van Meeuwen]

 configure.ac                                    |    4 ++--
 share/templates/roundcubemail/kolab.inc.php.tpl |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 14343d7078e4b8871184491471172cf17f81dd6c
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Aug 3 16:37:01 2012 +0100

    Release version 0.5.0

diff --git a/configure.ac b/configure.ac
index 44691e6..f3ae12c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT([pykolab], 0.5)
-AC_SUBST([RELEASE], 0.19)
+AC_INIT([pykolab], 0.5.0)
+AC_SUBST([RELEASE], 1)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
 


commit 670e4c5527b0199b748c651b6dde9b4e944088d8
Merge: edac79c 9d20b49
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Aug 3 16:36:41 2012 +0100

    Merge branch 'master' of ssh://git.kolabsys.com/git/pykolab



commit edac79c4a05fb7e04cc6a012b5ac3b40d5856ca9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Aug 3 16:36:22 2012 +0100

    Adjust the freebusy server setting for a default deployment

diff --git a/share/templates/roundcubemail/kolab.inc.php.tpl b/share/templates/roundcubemail/kolab.inc.php.tpl
index 747ad07..124b26e 100644
--- a/share/templates/roundcubemail/kolab.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab.inc.php.tpl
@@ -5,7 +5,7 @@
 \$rcmail_config['kolab']['ldap']['phpdn'] = '$ldap_service_bind_dn';
 \$rcmail_config['kolab']['ldap']['phppw'] = '$ldap_service_bind_pw';
 
-\$rcmail_config['kolab']['freebusy']['server'] = 'http://' . \$_SERVER["HTTP_HOST"] . '/freebusy';
+\$rcmail_config['kolab_freebusy_server'] = 'http://' . \$_SERVER["HTTP_HOST"] . '/freebusy';
 
 \$rcmail_config['kolab']['imap']['secure'] = true;
 \$rcmail_config['kolab']['imap']['namespaces'] = array(