projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7de5147 da74028)
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
MasterKey Widget Set