Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 6 Dec 2013 09:17:41 +0000 (13:17 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Fri, 6 Dec 2013 09:17:41 +0000 (13:17 +0400)

Trivial merge