Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 13 Jan 2015 11:54:37 +0000 (14:54 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 13 Jan 2015 11:54:37 +0000 (14:54 +0300)
commit6a720fcd56742930c1f085cfb5bf055f9539fe3c
tree307a90623cb69fb59d3f3d25e040dd7883a0bfaa
parent25b03894702bcf0be56b9d0aa98b010569874b6b
parent9fc97c7a2c634cfa36401495ae2c8e83b10f83ad
Merge remote-tracking branch 'origin/master'