From: Andrea Zagli <azagli@libero.it>
Date: Sun, 20 Apr 2014 08:11:04 +0000 (+0200)
Subject: Merge branch 'master' into gtk3
X-Git-Tag: v0.2.0^0
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=5fbff8072addc2d18e5325efef6250d8084c2fa9;p=zakauthe%2Flibzakauthe

Merge branch 'master' into gtk3

Conflicts:
	configure.ac
---

5fbff8072addc2d18e5325efef6250d8084c2fa9