IntelliJ IDEA (Cassiopeia) IU-140.548 <develar@develar-air.fritz.box Delete Netty project.xml, External Tools.xml, Ruby_Rails.xml, Default.xml, MacOSXRevision2Keymap.xml, My Mac OS X 10_5_.xml
IntelliJ IDEA (Cassiopeia) IU-140.548 <develar@develar-air.fritz.box Update other.xml, project.default.xml	Create Netty project.xml, External Tools.xml, Ruby_Rails.xml, Default.xml, MacOSXRevision2Keymap.xml, My Mac OS X 10_5_.xml
Merge branch 'master'