From: Niels Erik G. Nielsen <nielserik@indexdata.com>
Date: Tue, 12 Mar 2013 20:38:03 +0000 (-0400)
Subject: Merge branch 'temp'
X-Git-Tag: v0.0.7~211
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=5ab47cde8196b12682ee573361586f357dd35882;hp=5ab47cde8196b12682ee573361586f357dd35882;p=mkjsf-moved-to-github.git

Merge branch 'temp'

Conflicts:
	src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
---