fix up merge conflicts to compile on strict settings
authorkremlin <ian@kremlin.cc>
Thu, 26 Jun 2014 02:16:18 +0000 (21:16 -0500)
committerkremlin <ian@kremlin.cc>
Thu, 26 Jun 2014 02:16:18 +0000 (21:16 -0500)

No differences found