Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 3 Jul 2014 18:21:17 +0000 (20:21 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 3 Jul 2014 18:21:17 +0000 (20:21 +0200)
commit38157d2a178c0899faf1f6e9b4d350e06d55efce
tree21e6905efdd8a6e46c912df0e5a400ba9a39a2dc
parent03ea6722a7795568fc5fae477d0a77bcc95ad761
parent801e23d65b3a2ecf94dbcb6f24eb3b37a0649ae8
Merge remote-tracking branch 'origin/master'