Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 29 Mar 2013 14:40:39 +0000 (18:40 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 29 Mar 2013 14:40:39 +0000 (18:40 +0400)

Trivial merge