Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Mon, 13 May 2013 15:59:47 +0000 (11:59 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Mon, 13 May 2013 15:59:47 +0000 (11:59 -0400)
commitc97ac9f279f5847b7c702c43aa272d899157257f
tree20a3c96e1187c2b1a82f0346e95f7448a524997c
parent753638f22814ee59667015172d8d53c9c9a8e771
parent4a136b8b9144cbcf5f8cab0d04de8070e68a12a6
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf

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