Aleksander Machniak f5a807291e Merge branch 'master' into manticore ... Conflicts: plugins/kolab_files/kolab_files.js		2015-11-10 10:55:30 +01:00
..
larry	Merge branch 'master' into manticore	2015-11-10 10:55:30 +01:00