projects / pazpar2-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9350f9 18f2ca9)
Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 23 Apr 2014 12:45:10 +0000 (14:45 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 23 Apr 2014 12:45:10 +0000 (14:45 +0200)
Conflicts:
src/getaddrinfo.c
src/host.c


Trivial merge
Metasearcher