Dmitriy Simushev ae149896e7 Merge branch 'v1.6.x' into OSSG/master ... Conflicts: src/messenger/webim/install/dbperform.php src/messenger/webim/js/164/common.js src/messenger/webim/libs/common.php src/messenger/webim/locales/en/properties src/messenger/webim/locales/ru/properties src/messenger/webim/operator/canned.php src/messenger/webim/operator/operator.php src/messenger/webim/operator/operators.php src/messenger/webim/operator/performance.php src/messenger/webim/operator/settings.php src/messenger/webim/operator/translate.php src/messenger/webim/operator/update.php src/messenger/webim/operator/users.php src/messenger/webim/view/agents.php src/messenger/webim/view/performance.php		2013-03-11 11:01:35 +00:00
..
dbinfo.php	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
dbperform.php	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
index.php	Merge branch 'v1.6.x' into OSSG/master	2013-03-11 11:01:35 +00:00
whatsnew.txt	apache 2 license (started); upgrade version to 1.6.5	2013-03-05 00:24:26 +01:00