Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 26 Aug 2015 16:39:11 +0000 (18:39 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 26 Aug 2015 16:39:11 +0000 (18:39 +0200)
commit54436b9d4829e0eb0f9a9c86f29eeaf144f69744
tree1f59e607b171ac63b019d2b9a131007a80e5e262
parentae3890809a5aa9c6d13f875c93e716cd5f935a61
parente05a9dbb30fae7b6142763db13ad8c013b2729f5
Merge remote-tracking branch 'origin/master'