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)
commit35693e489b648e8b13184d50946d345009a94322
treef648be7a4a3365b03859e679d5ceaa3e59912b0c
parent7de5147d6c9e5ea9029099af8865484fc8809afa
parentda74028828754e46995c83682fca1e40a12e95c8
Merge remote branch 'origin/wosch'

Conflicts:
test/spec/mkws-pazpar2.js