Merge remote-tracking branch 'origin/master'
authorliana.bakradze <liana.bakradze@jetbrains.com>
Tue, 23 Dec 2014 17:45:50 +0000 (20:45 +0300)
committerliana.bakradze <liana.bakradze@jetbrains.com>
Tue, 23 Dec 2014 17:45:50 +0000 (20:45 +0300)

Trivial merge