IntelliJ IDEA 14.0 <riad@riad-osx1.local Update ide.general.xml
IntelliJ IDEA 14.0 <riad@riad-osx1 Update ide.general.xml
IntelliJ IDEA 14.0.1 <riad@riad-osx1.local Update ide.general.xml
IntelliJ IDEA 14.0.1 <riad@riad-osx1.local Update other.xml, RiaD_local.xml
IntelliJ IDEA (Cassiopeia) IU-139.463.4 <riad@riad-osx1.local Update ide.general.xml
IntelliJ IDEA (Cassiopeia) IU-139.463.4 <riad@riad-osx1.local Update other.xml, RiaD_local.xml
IntelliJ IDEA (Cassiopeia) IU-139.463.4 <riad@77.88.17.47-red2.dhcp.yndx.net Update ide.general.xml
IntelliJ IDEA (Cassiopeia) IU-139.463.4 <riad@77.88.17.47-red2.dhcp.yndx.net Update ide.general.xml
IntelliJ IDEA (Cassiopeia) IU-139.463.4 <riad@riad-osx1.local Update ide.general.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/ide.general.xml
	$APP_CONFIG$/other.xml