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)
Conflicts:
.idea/modules.xml

1  2 
.idea/modules.xml

Simple merge