Merge branch 'master' of /home/sher/Projects/temp_IDEA
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 20 Jun 2014 10:10:46 +0000 (12:10 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 20 Jun 2014 10:10:46 +0000 (12:10 +0200)

Trivial merge