projects / pazpar2-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f1fa7a 3951e71)
Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 19 Aug 2014 07:41:57 +0000 (09:41 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 19 Aug 2014 07:41:57 +0000 (09:41 +0200)
Conflicts:
src/getaddrinfo.c
src/host.c
src/host.h


Trivial merge
Metasearcher