Changes to 'dev/kolab-cache-refactoring-3.1'

[Aleksander Machniak]

New branch 'dev/kolab-cache-refactoring-3.1' available with the following commits:
commit 512cd3552e4e29d19305c6c3177725d6b1c9ac7a
Merge: 834e4f6 ee30f6f
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Thu Oct 10 10:28:05 2013 +0200

    Merge branch 'dev/kolab-cache-refactoring' into dev/kolab-cache-refactoring-3.1
    
    Conflicts:
    	plugins/calendar/drivers/kolab/kolab_driver.php
    	plugins/libkolab/lib/kolab_storage.php
    	plugins/libkolab/lib/kolab_storage_cache.php