Merge branch 'master' into upsource-master
authorEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Fri, 16 Nov 2012 13:35:19 +0000 (14:35 +0100)
committerEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Fri, 16 Nov 2012 13:35:19 +0000 (14:35 +0100)
commit837f58eb17285e6ac2595ab6770fad630a5f958a
tree39765f7fb8355e51719902c1902878e34542c8b3
parent39c044c10741d20756bc371f81c0720395cb4b4f
parenta155675cbe4c63487ce38cba3e83c6d00f6a3cdf
Merge branch 'master' into upsource-master