Merge 'origin/master'
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 21 Jan 2015 15:58:43 +0000 (18:58 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Wed, 21 Jan 2015 15:58:43 +0000 (18:58 +0300)
commit7d6be7098e7f0dab277b99a6364d84ec3af68574
tree6d4aa559666205ce8045479143754a4382f1d585
parentd5e3a77cb0f6eb6f3a16fcb071b6e7064595f51d
parent4b49780e2f74bce02a7f57546cdda2039ef6c69d
Merge 'origin/master'