Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 19 May 2015 18:15:54 +0000 (21:15 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 19 May 2015 18:15:54 +0000 (21:15 +0300)
commitb1a4d3fab7201972988a78fb6515af2e38367420
treebadb514b1ac1ec1e1d9d40a458cd25abb87b4998
parentf6ce6ef6ec6f99d720f92e0628c6aceae0d24c04
parent6b8582969e7834e38be407b9079953ce9957ca92
Merge remote-tracking branch 'origin/master'