Update plugin_ui.xml
Update plugin_ui.xml, ide.general.xml
PyCharm PY-139.113 <riad@77.88.17.47-red2.dhcp.yndx.net Update packages.xml, ide.general.xml
PyCharm PY-139.113 <riad@77.88.17.47-red2.dhcp.yndx.net Update plugin_ui.xml, ide.general.xml
PyCharm PY-139.113 <riad@77.88.17.47-red2.dhcp.yndx.net Update other.xml, plugin_ui.xml, ide.general.xml
PyCharm PY-139.113 <riad@77.88.17.47-red2.dhcp.yndx.net Update other.xml, packages.xml, ide.general.xml
PyCharm PY-139.113 <riad@77.88.17.47-red2.dhcp.yndx.net Update filetypes.xml, plugin_ui.xml, ide.general.xml, RiaD.xml
PyCharm PY-139.113 <riad@77.88.17.47-red2.dhcp.yndx.net Update other.xml, packages.xml, plugin_ui.xml, ide.general.xml
PyCharm PY-139.113 <riad@77.88.17.47-red2.dhcp.yndx.net Update other.xml
PyCharm PY-139.113 <riad@77.88.17.47-red2.dhcp.yndx.net Update other.xml, RiaD_local.xml
PyCharm PY-139.113 <riad@77.88.17.47-red2.dhcp.yndx.net Update packages.xml, filetypes.xml, ide.general.xml
PyCharm PY-139.113 <riad@77.88.17.47-red2.dhcp.yndx.net Update filetypes.xml, ide.general.xml
PyCharm PY-139.113 <riad@77.88.17.47-red2.dhcp.yndx.net Update ide.general.xml
PyCharm PY-139.354 <riad@77.88.17.47-red2.dhcp.yndx.net Update packages.xml, ide.general.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/filetypes.xml
	$APP_CONFIG$/ide.general.xml
	$APP_CONFIG$/other.xml