From: L. D. Pinney Date: Sat, 25 Feb 2017 04:01:44 +0000 (-0600) Subject: Merge remote-tracking branch 'upstream/v1.4-stage' into v1.4-stage X-Git-Tag: v1.4-core-RC1~14^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e5c4e4dab255306d87068209f490179a0e69cdb8;p=librecmc%2Flibrecmc.git Merge remote-tracking branch 'upstream/v1.4-stage' into v1.4-stage --- e5c4e4dab255306d87068209f490179a0e69cdb8