From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 27 Oct 2014 14:17:40 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
X-Git-Tag: v1.6.2~6
X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=commitdiff_plain;h=5220e29f76ee7ff0be09993af4c5fc5e83a05b2b

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp

Conflicts:
	IDMETA
---

5220e29f76ee7ff0be09993af4c5fc5e83a05b2b