Merge remote-tracking branch 'origin/master'
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 17 Jun 2011 16:57:25 +0000 (18:57 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 17 Jun 2011 16:57:25 +0000 (18:57 +0200)
commit48d9974816654b63e7b64842e9a1a91e2d3d7c14
tree6ade2712356c017ae5fd3d8908d1ae96671e670f
parentaaf3fb4df068ae3e6d37cb8252043ee103b96b87
parentac9e6f0702c28c20663b2e1bef3394a7b5f418f5
Merge remote-tracking branch 'origin/master'
platform/util/src/com/intellij/openapi/util/UserDataHolderBase.java