IntelliJ IDEA 14.0.1 <csaba@sabayon Update other.xml
IntelliJ IDEA 14.0.1 <csaba@sabayon Update other.xml
Merge branch 'master'
IntelliJ IDEA 14.0.1 <csaba@sabayon Update php.xml, Codding Horror.icls, Dreamweaver.icls, Csaba2.icls, other.xml, Oughsumm.icls, Csaba.icls, Schuss.icls, Igor.icls, Impulse.icls, Dreamweaver Csaba.icls, ide.general.xml, Roboticket.icls, EasyEyesYellow.icls
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/php.xml