From: Andrea Zagli <azagli@libero.it>
Date: Mon, 25 Apr 2016 08:27:47 +0000 (+0200)
Subject: Merge conflict.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=84b38cb3a6b03556c93034f5fc60f3fcf15e2e83;p=zakauthe%2Fplugins%2Fdb

Merge conflict.
---

84b38cb3a6b03556c93034f5fc60f3fcf15e2e83