Merge pull request #2921 from keszybz/do-not-report-masked-units-as-changed

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Tue, 3 May 2016 18:08:39 +0000 (14:08 -0400)

committer Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Tue, 3 May 2016 18:08:39 +0000 (14:08 -0400)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 3 May 2016 18:08:39 +0000 (14:08 -0400)
committer Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 3 May 2016 18:08:39 +0000 (14:08 -0400)
diff --cc src/core/load-fragment.c
Simple merge
diff --cc src/core/unit.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 3 May 2016 18:08:39 +0000 (14:08 -0400)
committer	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 3 May 2016 18:08:39 +0000 (14:08 -0400)
		1	2
src/core/load-fragment.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/unit.c	patch \|	diff1 \|	diff2 \|	blob \| history