commit bd781b15e0d3994347ff191e1a1dfdbc1d444c29 Merge: 1661daa 7e4ef73 Author: Tom Ritter tom@ritter.vg Date: Wed Mar 8 15:47:19 2017 -0600

Merge branch 'scanner-debug'

NetworkScanners/BwAuthority/aggregate.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)