Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 4 Feb 2015 13:56:16 +0000 (16:56 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 4 Feb 2015 13:56:16 +0000 (16:56 +0300)
1  2 
.idea/modules.xml

Simple merge