PyCharm 4.0.3 <riad@77.88.17.47-red2.dhcp.yndx.net Update other.xml, ide.general.xml
PyCharm 4.0.3 <riad@77.88.17.47-red2.dhcp.yndx.net Update packages.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/ide.general.xml
PyCharm 4.0.3 <riad@77.88.17.47-red2.dhcp.yndx.net Update other.xml, project.default.xml, filetypes.xml, ide.general.xml	Create Deployment.xml, _.xml, Default _1_.xml, riad_osx_keymap.xml, Mac OS X copy.xml, Default.xml, Mac OS X 10_5_ copy.xml, RiaD.xml, RiaD_local.xml	Delete __deleted.xml
PyCharm 4.0.3 <riad@77.88.17.47-red2.dhcp.yndx.net Update packages.xml, ide.general.xml