Commit 886f882c authored by Daniel Salzman's avatar Daniel Salzman

Merge branch 'fix_redundant_soa_rrsig' into 'master'

bugfix: changeset merge cancelout confused by changing RRSIG TTL

See merge request !990
parents e8f956e2 b18e9188