Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 14 Jan 2015 11:51:28 +0000 (12:51 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 14 Jan 2015 11:51:28 +0000 (12:51 +0100)
commitc1ff685a3c48bf1af81d72dfef0db0710ce5adae
treeb7a881b3a96c0fbfce8674f697d55a798c148094
parentaf61161c1ea952611ab1c67e9fb22382c9b2994e
parent1854a24555bebb3142bc137a7f49366aa7ae9bca
Merge remote-tracking branch 'origin/master'