Merge branch 'master' of git://github.com/asedunov/intellij-community into pull97
authorDmitry Jemerov <yole@jetbrains.com>
Tue, 10 Sep 2013 19:14:29 +0000 (21:14 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Tue, 10 Sep 2013 19:14:29 +0000 (21:14 +0200)
commit296e85faf6e511fc7972706126b498fd35ab8c51
tree72664033ca1360178050ea5fbb6f964132cea2dd
parent816cc8a140269e34190ef9e5e54985f843c995c8
parenta75c57d4503a65e79bcee594dab6ab0fc44d5c54
Merge branch 'master' of git://github.com/asedunov/intellij-community into pull97