From: Wolfram Schneider <wosch@indexdata.dk>
Date: Tue, 8 Apr 2014 10:36:29 +0000 (+0000)
Subject: Merge remote branch 'origin/wosch'
X-Git-Tag: 1.0.0~995
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=35693e489b648e8b13184d50946d345009a94322;p=mkws-moved-to-github.git

Merge remote branch 'origin/wosch'

Conflicts:
	test/spec/mkws-pazpar2.js
---

35693e489b648e8b13184d50946d345009a94322