PyCharm 4.0.3 <zhou@zhou-macbook.local Update packages.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/packages.xml