From: Heikki Levanto <heikki@indexdata.dk>
Date: Fri, 7 Mar 2014 12:45:36 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~1318^2~26
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=64b41a1411996e44a840dc3568f2d25ae83853f7;hp=64b41a1411996e44a840dc3568f2d25ae83853f7;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

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