From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 9 Sep 2014 10:41:15 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~19
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=09cd372980c24452ffd9d7a7660d9580f91884e8;p=pazpar2-moved-to-github.git

Merge branch 'master' into paz-927
---

09cd372980c24452ffd9d7a7660d9580f91884e8