PyCharm 4.0.2 <riad@77.88.17.47-red2.dhcp.yndx.net Update other.xml, packages.xml, ide.general.xml	Delete __deleted.xml
PyCharm 4.0.2 <riad@77.88.17.47-red2.dhcp.yndx.net Update filetypes.xml
PyCharm PY-139.742 <riad@77.88.17.47-red2.dhcp.yndx.net Update other.xml, packages.xml, ide.general.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/filetypes.xml
PyCharm PY-139.742 <riad@77.88.17.47-red2.dhcp.yndx.net Update other.xml, editor.codeinsight.xml, notifications.xml, ide.general.xml, RiaD.xml, customization.xml