Merge branch 'master' into mikhail.golubev/json-preview
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Wed, 3 Sep 2014 11:02:24 +0000 (15:02 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Wed, 3 Sep 2014 11:02:24 +0000 (15:02 +0400)
commitc12104546dace68b7cfba44def7339a90979c689
treef4d4d9b0c1b6abfd19964f84a47f5a2ca337bb9b
parent9bb709beb393e1659283f48090bc41f08e4babfe
parent9fd3d8ac6d9230efe77cb5596bb278884586044a
Merge branch 'master' into mikhail.golubev/json-preview

Conflicts:
community-main.iml
community-main.iml
resources/src/idea/RichPlatformPlugin.xml