From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Thu, 12 Jan 2017 06:23:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into nginx
X-Git-Tag: v5.6.0~34
X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=302c97f7ac81dfcc6fc8d8d44359f4f432e4618a;hp=302c97f7ac81dfcc6fc8d8d44359f4f432e4618a;p=brisk.git

Merge remote-tracking branch 'origin/master' into nginx

Conflicts:
	web/briskin5/index_wr.php
	web/index_wr.php
---