Merge remote-tracking branch 'origin/master' into test2
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 15 Jan 2015 19:52:04 +0000 (22:52 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 15 Jan 2015 19:52:04 +0000 (22:52 +0300)
commitf9bb745f6245c6ddbf65f64a0ebe538448267332
treeddf04a9fe52ce9081a4503ee8ca2ea996fe76670
parentdcca21865a41868a785c9df844e41f3996939502
parent7a4b122a25c4735965888fc5e2ed16b0824d63f3
Merge remote-tracking branch 'origin/master' into test2