Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 13 Apr 2015 22:37:30 +0000 (01:37 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 13 Apr 2015 22:37:30 +0000 (01:37 +0300)
commit25c4c0c014773ab9c6e8199ba325fcac130fe1b0
tree8e6618ec5b32f5f2012a12aeb83e4035b0a636da
parenta9b29c527db8a73d99f9bf4faa5e0397dd62e496
parentbcae4d6272cbe41095d3cbf0f7949e5099688b7e
Merge remote-tracking branch 'origin/master'