From: Dennis Schafroth <dennis@indexdata.com>
Date: Mon, 23 Apr 2012 10:44:21 +0000 (+0000)
Subject: Merge branch 'master' into protocol-version2
X-Git-Tag: v1.6.13~16^2~19
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=fa7a8f45862f7d2b89154e4a38ff01ffe4fb30a3;p=pazpar2-moved-to-github.git

Merge branch 'master' into protocol-version2
---

fa7a8f45862f7d2b89154e4a38ff01ffe4fb30a3