Merge branch 'master' into upsource-master
authorEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Wed, 25 Jul 2012 10:15:47 +0000 (12:15 +0200)
committerEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Wed, 25 Jul 2012 10:15:47 +0000 (12:15 +0200)
commitf6f0002a06ca5e416346e97e12ec5a4931fe9923
tree4ae8a215263b8f82910438436aafb0f131181158
parent8cdaaee00d8b7a8ca82b397d615afb1a1ed1bb64
parent7740567b1ec6b50bb4334a3242aa419ae8be2fec
Merge branch 'master' into upsource-master