Merge branch 'temp'
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Tue, 12 Mar 2013 20:38:03 +0000 (16:38 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Tue, 12 Mar 2013 20:38:03 +0000 (16:38 -0400)
commit5ab47cde8196b12682ee573361586f357dd35882
tree53a616ec3a6a87baf744e6755dc611a0182035f6
parent8826b060b0f4cd133df49675945603de88175d49
parent23d3b19cec1870969a3783d7070b23137c90a86c
Merge branch 'temp'

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