Alexey Melnichuk a4b0b2d271 Merge branch 'master' into number_alias_as_vm_id ... Conflicts: app/hot_desking/extension_edit.php		2015-07-21 11:19:13 +04:00
..
scripts	Merge branch 'master' into number_alias_as_vm_id	2015-07-21 11:19:13 +04:00
sql	Remove i386 causes problems for mod_shout and mpg123	2013-08-27 05:35:24 +00:00