Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 6 Feb 2014 15:56:33 +0000 (16:56 +0100)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 6 Feb 2014 15:56:33 +0000 (16:56 +0100)
commit059b544941a19eb4e7cacf08d2a3a6d9740f92e9
treefa2ed6049c5379d7bdea21d8e82e284e6ca99be9
parent7642e909a5b6666f529f452a435c3a3b5e5a562a
parent0071d64575e2c1850fd18d536d504cf40fcd1e4a
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

Conflicts:
test/Makefile
test/Makefile