Merge branch 'dany/groovydoc'
authorDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Wed, 24 Aug 2016 17:36:39 +0000 (20:36 +0300)
committerDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Wed, 24 Aug 2016 17:36:39 +0000 (20:36 +0300)

Trivial merge