From: Branden Archer <b.m.archer4@gmail.com>
Date: Fri, 23 Dec 2016 17:41:36 +0000 (-0500)
Subject: Merge branch 'master' into fix_cmake_libcompat_h
X-Git-Tag: 0.12.0~14^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=181f403896131e934a5b3a9d39581cace90d6baa;p=check

Merge branch 'master' into fix_cmake_libcompat_h
---

181f403896131e934a5b3a9d39581cace90d6baa