Merge branch 'ping' into 1.0-pre12
authorStricted <info@stricted.net>
Thu, 12 Jan 2017 04:25:44 +0000 (05:25 +0100)
committerStricted <info@stricted.net>
Thu, 12 Jan 2017 04:25:44 +0000 (05:25 +0100)
commite5a2d1ff4650790946f89f82aecc22b427c9f7f9
tree6f189cc26ea4d393ab778be68467d64811270eac
parent2e30b3f678d462754894424203174a64b9f6d2c1
parent54802b999f2ba8a9f317bd2e169b4a173bc98942
Merge branch 'ping' into 1.0-pre12