IntelliJ IDEA 14.0.1 <csaba@sabayon Update other.xml
Merge branch 'master'