Merge pull request #32 from jsiverskog/master
authorsbyx <steven@midlink.org>
Mon, 16 Jun 2014 10:11:47 +0000 (12:11 +0200)
committersbyx <steven@midlink.org>
Mon, 16 Jun 2014 10:11:47 +0000 (12:11 +0200)
protobuf: import from packages, bump version, fix build errors.


Trivial merge