Merge branch 'master' of git://github.com/asedunov/intellij-community into pull101
authorDmitry Jemerov <yole@jetbrains.com>
Thu, 12 Sep 2013 13:25:59 +0000 (15:25 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Thu, 12 Sep 2013 13:25:59 +0000 (15:25 +0200)
commit24effbdc877b20dd4983b4c1ab15224d9f0d3316
treead5b1945c79ef0d619eaa296baf57458abacf90b
parentc2ea835a9a252ed527db5555d598cc6943dc97d0
parent243ba784a628b6cd0c5a07793367a11a3d58731e
Merge branch 'master' of git://github.com/asedunov/intellij-community into pull101