Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorHeikki Levanto <heikki@indexdata.dk>
Fri, 7 Mar 2014 12:45:36 +0000 (13:45 +0100)
committerHeikki Levanto <heikki@indexdata.dk>
Fri, 7 Mar 2014 12:45:36 +0000 (13:45 +0100)
commit64b41a1411996e44a840dc3568f2d25ae83853f7
tree0cd311829520260fa2f12670fa8eae56b775d3a5
parenta00a2a64bb63cac554d0748aa35720af82f13b84
parent3e2d556873ff8f507caea7a6918ad630b634daf1
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

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