From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 28 Jan 2014 10:39:47 +0000 (+0100)
Subject: Merge branch 'master' into yaz-728
X-Git-Tag: v5.0.13~34
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=9b04152a82503089d00716b383fdc20759990587;p=yaz-moved-to-github.git

Merge branch 'master' into yaz-728
---

9b04152a82503089d00716b383fdc20759990587