From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 8 Sep 2014 12:33:05 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~21
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=dcb7c9bf6a3ac5da671fd889ebb989b610ba6bc5;p=pazpar2-moved-to-github.git

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

dcb7c9bf6a3ac5da671fd889ebb989b610ba6bc5