Merge branch 'macros'
commitb801a66216549f3581741f753aa136cf158eac26
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 25 Nov 2009 14:30:50 +0000 (25 17:30 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 25 Nov 2009 14:30:50 +0000 (25 17:30 +0300)
treeafc2a5ccfe0b1b6b8995cf0d9b3c8a681241f2e4
parent794d6afa85e851fafc552ad6847bdef48775d0cb
parent699abe9d4ba01c8a932c1de9f8a7f254dc8fedb2
Merge branch 'macros'