Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 4 Aug 2014 11:51:42 +0000 (13:51 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 4 Aug 2014 11:51:42 +0000 (13:51 +0200)
commitbaf5e360ddb7e83ba0a87019a31826f9a019b93c
tree7fe7b8fedb794515025fa266c7c617a7b3a9d0c3
parent455f0a52c987dd68b7c74deb327bc164f23fdfc2
parent88acaffd5d4c417c8cc4a80d9982f6d496cd4173
Merge remote-tracking branch 'origin/master'