Merge branch 'master' of makar:/var/www/git/e-sieve
authorFrank DeMarco <frank.s.demarco@gmail.com>
Mon, 24 Oct 2016 01:20:18 +0000 (21:20 -0400)
committerFrank DeMarco <frank.s.demarco@gmail.com>
Mon, 24 Oct 2016 01:20:18 +0000 (21:20 -0400)
Conflicts:
lib/pgfw


Trivial merge