Merge remote-tracking branch 'origin/master'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Mon, 20 Jan 2014 11:57:57 +0000 (15:57 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Mon, 20 Jan 2014 11:57:57 +0000 (15:57 +0400)

Trivial merge