From: Dennis Schafroth <dennis@indexdata.com>
Date: Fri, 4 Nov 2011 12:56:14 +0000 (+0100)
Subject: Merge branch 'master' into bytarget_block
X-Git-Tag: mobile-beta-1~17
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=1ebd3d525542f35736b08393028f1d8a75d50540;p=pazpar2-moved-to-github.git

Merge branch 'master' into bytarget_block
---

1ebd3d525542f35736b08393028f1d8a75d50540