Merge remote-tracking branch 'origin/master'
authorDmitry Jemerov <yole@jetbrains.com>
Fri, 18 Oct 2013 16:34:37 +0000 (18:34 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Fri, 18 Oct 2013 16:34:37 +0000 (18:34 +0200)

Trivial merge