Merge remote-tracking branch 'origin/master' into test2
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 15 Jan 2015 12:48:08 +0000 (15:48 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 15 Jan 2015 12:48:08 +0000 (15:48 +0300)
commit5d0af990e2fb81e86b93ef6dd57c0006cdfd064f
tree434d99a1bea17422ec7751327acaa4236168d850
parent06caff8d263f7e68d9b0ca67ab3177c6c914094e
parent8e650fc4ecda5db616bac5d3b0e73590c7c6ba50
Merge remote-tracking branch 'origin/master' into test2