Merge branch 'master' of ssh://git.klab.cc/git/vanmeeuwen/kolab-wap

Conflicts:
	lib/kolab_admin_client_task.php
	lib/kolab_html.php
	public_html/include/kolab_utils.php
	public_html/include/tasks/main.php
	public_html/include/tasks/user.php
	public_html/lib/Smarty/Smarty.class.php
	public_html/lib/Smarty/plugins/block.textformat.php
	public_html/lib/Smarty/plugins/function.fetch.php
	public_html/lib/Smarty/plugins/function.html_checkboxes.php
	public_html/lib/Smarty/plugins/function.html_image.php
	public_html/lib/Smarty/plugins/function.html_radios.php
	public_html/lib/Smarty/plugins/function.mailto.php
	public_html/lib/Smarty/plugins/modifier.capitalize.php
	public_html/lib/Smarty/plugins/modifier.date_format.php
	public_html/lib/Smarty/plugins/modifier.debug_print_var.php
	public_html/lib/Smarty/plugins/modifier.escape.php
	public_html/lib/Smarty/plugins/modifier.replace.php
	public_html/lib/Smarty/plugins/modifier.spacify.php
	public_html/lib/Smarty/plugins/modifier.truncate.php
	public_html/lib/Smarty/plugins/modifiercompiler.count_characters.php
	public_html/lib/Smarty/plugins/modifiercompiler.count_sentences.php
	public_html/lib/Smarty/plugins/modifiercompiler.count_words.php
	public_html/lib/Smarty/plugins/modifiercompiler.escape.php
	public_html/lib/Smarty/plugins/modifiercompiler.from_charset.php
	public_html/lib/Smarty/plugins/modifiercompiler.lower.php
	public_html/lib/Smarty/plugins/modifiercompiler.strip.php
	public_html/lib/Smarty/plugins/modifiercompiler.to_charset.php
	public_html/lib/Smarty/plugins/modifiercompiler.unescape.php
	public_html/lib/Smarty/plugins/modifiercompiler.upper.php
	public_html/lib/Smarty/plugins/modifiercompiler.wordwrap.php
	public_html/lib/Smarty/plugins/shared.escape_special_chars.php
	public_html/lib/Smarty/plugins/shared.mb_wordwrap.php
	public_html/lib/Smarty/plugins/variablefilter.htmlspecialchars.php

0 files changed, 0 insertions, 0 deletions