Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Wed, 6 Apr 2011 10:18:35 +0000 (12:18 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 6 Apr 2011 10:18:35 +0000 (12:18 +0200)
commitb870d31e2a380260faf8b85ff6b54d5fe775f882
tree54ea9e757895efea89964ddf9ffd645eb026a5b9
parent846689d992d2183563cba6aa5f52f60dc8b14ab4
parenta768cf2deb0154265ca27faa634c4c0e9e76939d
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
src/eventl.c
src/client.c