From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 13 Mar 2013 14:13:46 +0000 (+0100)
Subject: Merge branch 'master' into normal_cql
X-Git-Tag: v4.2.52~1^2~1
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=1d174be5d92bd388583905b152b0183665460bf6;p=yaz-moved-to-github.git

Merge branch 'master' into normal_cql
---

1d174be5d92bd388583905b152b0183665460bf6