Merge remote branch 'origin/wosch'
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 8 Apr 2014 10:36:29 +0000 (10:36 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 8 Apr 2014 10:36:29 +0000 (10:36 +0000)
Conflicts:
test/spec/mkws-pazpar2.js


Trivial merge