Merge branch 'master' of github.com:nanopb/nanopb
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>
Sat, 31 Dec 2016 08:42:59 +0000 (10:42 +0200)
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>
Sat, 31 Dec 2016 08:42:59 +0000 (10:42 +0200)

Trivial merge