Merge remote-tracking branch 'origin/master'
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 8 Jan 2015 17:42:47 +0000 (18:42 +0100)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 8 Jan 2015 17:42:47 +0000 (18:42 +0100)
commit674107553a4fff12035370ba5bf24d162886b42e
tree54c00bfe73639eea082921ee84fb1d6bfcdaefc5
parent5ede71fa772be836b1583691d28493659202d7fe
parent7867c2924d408f29b9b3c0cd182b2af31a5839ec
Merge remote-tracking branch 'origin/master'