Merge branch 'javaLineBreakpointType_ext'
authorNikolay.Tropin <Nikolay.Tropin@jetbrains.com>
Thu, 13 Aug 2015 13:49:07 +0000 (16:49 +0300)
committerNikolay.Tropin <Nikolay.Tropin@jetbrains.com>
Thu, 13 Aug 2015 13:49:07 +0000 (16:49 +0300)

Trivial merge