From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 16 Jul 2013 13:53:56 +0000 (+0200)
Subject: Merge branch 'master' into session_lock
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=refs%2Fheads%2Fsession_lock;p=pazpar2-moved-to-github.git

Merge branch 'master' into session_lock
---

66c4fe75aca4e4f45ef4820c087f3509c5edacd2