Merge pull request #6875
commit93521a4f56ce750f3d8fd89e1241c9944ad53d7c
authorPieter Wuille <pieter.wuille@gmail.com>
Wed, 28 Oct 2015 01:19:42 +0000 (28 02:19 +0100)
committerPieter Wuille <pieter.wuille@gmail.com>
Wed, 28 Oct 2015 01:21:47 +0000 (28 02:21 +0100)
tree9f1ab7d75ae55176ff0cd53876f19393891b0dd4
parentd0badb916e511da158c3626142745dfb14bd68e0
parent6e800c2b41aca7e4a22d341f1e6dcf722d94e6e1
Merge pull request #6875

6e800c2 Add Pieter's new PGP key to verify-commits/trusted-keys (Matt Corallo)
1d94b72 Whitelist commits signed with Pieter's now-revoked key (Matt Corallo)
27252b7 Fix pre-push-hook regexes (Matt Corallo)