Merge commit 'f6663322e3efc841d04a4336f7f9ff55a07e5128'

author Paul Hänsch <paul@plutz.net>

Tue, 18 Jun 2019 17:56:13 +0000 (19:56 +0200)

committer Paul Hänsch <paul@plutz.net>

Tue, 18 Jun 2019 17:56:13 +0000 (19:56 +0200)
author Paul Hänsch <paul@plutz.net>
Tue, 18 Jun 2019 17:56:13 +0000 (19:56 +0200)
committer Paul Hänsch <paul@plutz.net>
Tue, 18 Jun 2019 17:56:13 +0000 (19:56 +0200)
diff --cc cgilite/file.sh
Simple merge
diff --cc cgilite/session.sh
Simple merge
diff --cc cgilite/storage.sh
Simple merge
author	Paul Hänsch <paul@plutz.net>
	Tue, 18 Jun 2019 17:56:13 +0000 (19:56 +0200)
committer	Paul Hänsch <paul@plutz.net>
	Tue, 18 Jun 2019 17:56:13 +0000 (19:56 +0200)
		1	2
cgilite/file.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/session.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/storage.sh	patch \|	diff1 \|	diff2 \|	blob \| history