From: chaoskagami <chaos.kagami@gmail.com>
Date: Tue, 17 Jan 2017 18:20:36 +0000 (-0500)
Subject: Merge remote-tracking branch 'grayjack/factory-1.x-2.x-sigpatch'
X-Git-Tag: v0.3.1~26
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=e05f53a5a4348b9fd72bff3a8a2669a5f155de62;p=corbenik%2Fcorbenik.git

Merge remote-tracking branch 'grayjack/factory-1.x-2.x-sigpatch'
---

e05f53a5a4348b9fd72bff3a8a2669a5f155de62
diff --cc external/contrib_patch/1.x-2.x-factory-sigpatch.pco
index 0000000,a429c55..a429c55
mode 000000,100644..100644
--- a/external/contrib_patch/1.x-2.x-factory-sigpatch.pco
+++ b/external/contrib_patch/1.x-2.x-factory-sigpatch.pco