Merge branch 'slave'
authorpeter <peter.gromov@jetbrains.com>
Sun, 22 Aug 2010 18:53:13 +0000 (19:53 +0100)
committerpeter <peter.gromov@jetbrains.com>
Sun, 22 Aug 2010 18:53:13 +0000 (19:53 +0100)
commitf4d920f85a5267d357fe9bc0eb0f6927afb923fc
tree72d71ae0b63952006318f7f75ac004174ff70a48
parent48acf1fca89a44bbe21c91dacb42b0f5d1a25f26
parentc08b792d5876b59d2ee489b5afaf0581cc06471f
Merge branch 'slave'