Merge branch 'master' of github.com:nanopb/nanopb
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>
Sun, 12 Feb 2017 08:52:26 +0000 (10:52 +0200)
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>
Sun, 12 Feb 2017 08:52:26 +0000 (10:52 +0200)

Trivial merge