Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 19 Sep 2013 11:11:47 +0000 (13:11 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 19 Sep 2013 11:11:47 +0000 (13:11 +0200)
commita00add15f1d9f9a33d8f6fe2e5f3cb04171d8aa1
tree388e7916dfd34d14432e4c0be10af38c101b7433
parentb0c3ff462ce33f05398aef45cf83da3967ad2016
parent5a45e2c9d4e4fb7e3b547df12481b339f50ba8c3
Merge branch 'master' into sru_2_0

Conflicts:
IDMETA
client/client.c