Merge commit 'origin/master'
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 17 Sep 2010 08:45:55 +0000 (12:45 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 17 Sep 2010 08:45:55 +0000 (12:45 +0400)
commit2d94ac862f7ca9995b32e93a4e85d9d6054959ff
tree093ed05bb5838a79e3f06994f834e10dd1a99b32
parent602c12677ea1cae37854a01707cdaafa7953e331
parent4adb058bf93bf1e3e0f49dd5bfc1f59709746df3
Merge commit 'origin/master'