Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Sep 2013 07:20:23 +0000 (09:20 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Sep 2013 07:20:23 +0000 (09:20 +0200)
commitc6f7e21560c74ac3cd856c5d0bf9120fc2dfce9f
treef73ef295ace2f7e2f58fd519d9d32f10a8cbeb55
parentb0c3ff462ce33f05398aef45cf83da3967ad2016
parentfd89a3c57dcb6869c3943109d5b43a4f7abd628c
Merge branch 'master' into sru_2_0

Conflicts:
IDMETA
debian/changelog
debian/rules
client/client.c
debian/changelog
src/seshigh.c