Merge commit '5107961a3db5fd862e1924394ba56595fd36d44f' into develop

author Silvio Rhatto <rhatto@riseup.net>

Tue, 24 Oct 2017 11:24:17 +0000 (09:24 -0200)

committer Silvio Rhatto <rhatto@riseup.net>

Tue, 24 Oct 2017 11:24:17 +0000 (09:24 -0200)
author Silvio Rhatto <rhatto@riseup.net>
Tue, 24 Oct 2017 11:24:17 +0000 (09:24 -0200)
committer Silvio Rhatto <rhatto@riseup.net>
Tue, 24 Oct 2017 11:24:17 +0000 (09:24 -0200)
diff --cc puppet/bin/copymodules

index 0000000000000000000000000000000000000000,85f749918daaee36831b802916c844ccca196277..85f749918daaee36831b802916c844ccca196277

mode 000000,100755..100755
--- /dev/null
--- 2/bin/copymodules
+++ b/puppet/bin/copymodules
diff --cc puppet/bin/symlinks
Simple merge
author	Silvio Rhatto <rhatto@riseup.net>
	Tue, 24 Oct 2017 11:24:17 +0000 (09:24 -0200)
committer	Silvio Rhatto <rhatto@riseup.net>
	Tue, 24 Oct 2017 11:24:17 +0000 (09:24 -0200)
		1	2
puppet/bin/copymodules	patch \|	\|	diff2 \|	blob \| history
puppet/bin/symlinks	patch \|	diff1 \|	diff2 \|	blob \| history