From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Sun, 9 Jul 2017 17:02:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/together-for-fun' into nginx
X-Git-Tag: v5.6.0~33
X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=c0cc54c9494acf8f43b92a0517d32d38b5006aa0;hp=c0cc54c9494acf8f43b92a0517d32d38b5006aa0;p=brisk.git

Merge remote-tracking branch 'origin/together-for-fun' into nginx

Conflicts:
	web/briskin5/Obj/briskin5.phh
	web/briskin5/index_wr.php
	web/briskin5/stat-day.php
	web/briskin5/statadm.php
---