Merge branch 'wak-google-upstream1' (#223)
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>
Tue, 22 Nov 2016 15:25:24 +0000 (17:25 +0200)
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>
Tue, 22 Nov 2016 15:25:24 +0000 (17:25 +0200)
commit69e9c1fc8162956feffa32e07a97c53bdb92f5ef
treedeb364082476307da9f64fcfc847cc7e50d09626
parent82dd587c7b8d10150ab6683733863e2b7e34a428
parent928becdc52d7c8805b0e4259e0682df56e637da7
Merge branch 'wak-google-upstream1' (#223)