From: Andrea Zagli <azagli@libero.it>
Date: Tue, 24 Dec 2013 20:50:12 +0000 (+0100)
Subject: Merge conflit.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=5bfcd9942d18c97e041a0bbad8d61e372595ab5e;p=zakaudit%2Flibzakaudit

Merge conflit.
---

5bfcd9942d18c97e041a0bbad8d61e372595ab5e