Tue, 23 Aug 2016 07:45:23 +0200merge "default" branch into "keysync" branch and resolve 2 minor merge conflicts. Please check whether the resolve was okay. keysync
Roker <roker@pep-project.org> [Tue, 23 Aug 2016 07:45:23 +0200] rev 1057
merge "default" branch into "keysync" branch and resolve 2 minor merge conflicts. Please check whether the resolve was okay.

Tue, 23 Aug 2016 07:33:56 +0200merge default into my branch roker-linux
Roker <roker@pep-project.org> [Tue, 23 Aug 2016 07:33:56 +0200] rev 1056
merge default into my branch

Mon, 22 Aug 2016 19:10:41 +0200Documentation bug.
Krista Grothoff <krista@pep-project.org> [Mon, 22 Aug 2016 19:10:41 +0200] rev 1055
Documentation bug.

Mon, 22 Aug 2016 18:46:49 +0200Removed commented-out code
Krista Grothoff <krista@pep-project.org> [Mon, 22 Aug 2016 18:46:49 +0200] rev 1054
Removed commented-out code

Mon, 22 Aug 2016 18:43:31 +0200Merged ENGINE-73 into default. Still may not function appropriately under netpgp.
Krista Grothoff <krista@pep-project.org> [Mon, 22 Aug 2016 18:43:31 +0200] rev 1053
Merged ENGINE-73 into default. Still may not function appropriately under netpgp.

Mon, 22 Aug 2016 18:42:34 +0200Closed branch ENGINE-73 ENGINE-73
Krista Grothoff <krista@pep-project.org> [Mon, 22 Aug 2016 18:42:34 +0200] rev 1052
Closed branch ENGINE-73

Mon, 22 Aug 2016 18:41:01 +0200Merge default into feature branch ENGINE-73
Krista Grothoff <krista@pep-project.org> [Mon, 22 Aug 2016 18:41:01 +0200] rev 1051
Merge default into feature branch

Mon, 22 Aug 2016 18:37:22 +0200ENGINE-73: #comment Works on gpgme, including revoked filtering. Netpgp still causes problems, but I'll move this feature for netpgp into a separate feature so that Dean and Huss arent blocked. ENGINE-73
Krista Grothoff <krista@pep-project.org> [Mon, 22 Aug 2016 18:37:22 +0200] rev 1050
ENGINE-73: #comment Works on gpgme, including revoked filtering. Netpgp still causes problems, but I'll move this feature for netpgp into a separate feature so that Dean and Huss arent blocked.

Mon, 22 Aug 2016 17:03:40 +0200fixed test case for netpgp, which uses lowercase fpr ENGINE-73
Krista Grothoff <krista@pep-project.org> [Mon, 22 Aug 2016 17:03:40 +0200] rev 1049
fixed test case for netpgp, which uses lowercase fpr

Mon, 22 Aug 2016 17:27:03 +0200merging keysync
Volker Birk <vb@pep.foundation> [Mon, 22 Aug 2016 17:27:03 +0200] rev 1048
merging