tree c4b94ce4a09550f62d7c476aab066d524cc592ad
parent 438547641f5d9c65f07254b0948b269e45891ef4
parent 57962aac85a41f554e14da14906a3ba0bd8f9156
author Philip Withnall <withnall@endlessm.com> 1534170952 +0100
committer Philip Withnall <withnall@endlessm.com> 1534170952 +0100

Merge remote-tracking branch 'gvdb/master' into update-gvdb

Minor merge conflicts in gvdb-reader.c with the documentation.