Merge pull request #669 from poettering/dns-rr-memdup

author Tom Gundersen <teg@jklm.no>

Thu, 23 Jul 2015 10:34:34 +0000 (12:34 +0200)

committer Tom Gundersen <teg@jklm.no>

Thu, 23 Jul 2015 10:34:34 +0000 (12:34 +0200)
author Tom Gundersen <teg@jklm.no>
Thu, 23 Jul 2015 10:34:34 +0000 (12:34 +0200)
committer Tom Gundersen <teg@jklm.no>
Thu, 23 Jul 2015 10:34:34 +0000 (12:34 +0200)
diff --cc src/resolve/resolved-dns-packet.c
Simple merge
diff --cc src/resolve/resolved-dns-rr.c
Simple merge
author	Tom Gundersen <teg@jklm.no>
	Thu, 23 Jul 2015 10:34:34 +0000 (12:34 +0200)
committer	Tom Gundersen <teg@jklm.no>
	Thu, 23 Jul 2015 10:34:34 +0000 (12:34 +0200)
		1	2
src/resolve/resolved-dns-packet.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/resolve/resolved-dns-rr.c	patch \|	diff1 \|	diff2 \|	blob \| history