PyCharm 4.0.1 <riad@riad-osx1.local Update project.default.xml, editor.codeinsight.xml, notifications.xml, filetypes.xml, ide.general.xml, RiaD.xml, customization.xml	Create __deleted.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/filetypes.xml