Merge remote-tracking branch 'pycharmce/master'
authorDmitry Jemerov <yole@jetbrains.com>
Fri, 18 Oct 2013 15:50:43 +0000 (17:50 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Fri, 18 Oct 2013 15:50:43 +0000 (17:50 +0200)

Trivial merge