From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 22 Jan 2014 13:32:06 +0000 (+0100)
Subject: Merge branch 'master' into yaz-728
X-Git-Tag: v5.0.13~49
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=a741500ee64cc5009f82d94585ea389e1c5e6613;p=yaz-moved-to-github.git

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

a741500ee64cc5009f82d94585ea389e1c5e6613