From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 29 Apr 2011 11:26:48 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
X-Git-Tag: v1.2.5~1
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=a60c186e884b033ed25db9cd5775d72272e4b3d6;p=yazpp-moved-to-github.git

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

Conflicts:
	IDMETA
---

a60c186e884b033ed25db9cd5775d72272e4b3d6