Merge remote-tracking branch 'origin/json-support'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Tue, 19 Aug 2014 09:16:27 +0000 (13:16 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Tue, 19 Aug 2014 09:16:27 +0000 (13:16 +0400)
commit458df3067926cc714077cd9267eccf38cbece604
treed38e4d4ed01aa9ab13fd8ef3212bbc26f873e89d
parent374f75f8b870df87a6e1900d20723c680746b0a5
parent17a31c49f37ff97740199024f137fbe962adc634
Merge remote-tracking branch 'origin/json-support'

Conflicts:
.idea/modules.xml
.idea/modules.xml