From: Niels Erik G. Nielsen <nielserik@indexdata.com>
Date: Mon, 13 May 2013 15:59:47 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf
X-Git-Tag: v0.0.7~109
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=c97ac9f279f5847b7c702c43aa272d899157257f;hp=-c;p=mkjsf-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf

Conflicts:
	src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
---

c97ac9f279f5847b7c702c43aa272d899157257f