Merge in warning fixes (properly, this time).
authorDavid Given <dg@cowlark.com>
Mon, 12 Dec 2016 22:58:54 +0000 (23:58 +0100)
committerDavid Given <dg@cowlark.com>
Mon, 12 Dec 2016 22:58:54 +0000 (23:58 +0100)
commit560d13d88766c07f4c874f494368baa7555a9e72
treef4c17101eb07f68ccf89662275bc8c961756be35
parent9b525d741e703c0103c5b10c3c8c8df8314aec95
parent1c0818b5e543d9ede8810d37f18f8f207a95d8bf
Merge in warning fixes (properly, this time).