Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 22 Dec 2014 08:04:49 +0000 (09:04 +0100)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 22 Dec 2014 08:04:49 +0000 (09:04 +0100)
commit6ebb2f8fbe4de6e0cf6fd0bc297a757ba7edcb3e
tree9a5aa746adbd7993f2a5f2e434cdc190b9aa5368
parent9de79d7cc67f5844dfc5f5ab7f87cf7eb44500ba
parentc7b40d6375a0cb6c293043635a9c342bdafd84db
Merge remote-tracking branch 'origin/master'