Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 11 Feb 2015 17:26:01 +0000 (18:26 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 11 Feb 2015 17:26:01 +0000 (18:26 +0100)
commit40f69a711257cd2d4aa786ad5120dfbd9b61cab0
tree667c4a846b5a7dd0cf53483ceef142e0e6d7e5b2
parent1c0364399a65229104744b927020e72c0d17f851
parent97a6392c426abb95fdb8ddb4be6026b5334457a3
Merge remote-tracking branch 'origin/master'