Merge remote-tracking branch 'origin/master' into diff-cleanup
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Thu, 18 Jun 2015 14:52:56 +0000 (17:52 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Thu, 18 Jun 2015 14:52:56 +0000 (17:52 +0300)
commitaf1e24ca779408197ef605268bbf7469a645c626
tree5f805c53072481e517dd6d96f763f5ddbe04222e
parent47fe99b0758fd75db03a4a23bd7dcb8e2f497ffd
parent1b3a0893358544a2f156ab67f55110a1c495af7b
Merge remote-tracking branch 'origin/master' into diff-cleanup