Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Mon, 19 Dec 2011 11:06:12 +0000 (12:06 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 19 Dec 2011 11:06:12 +0000 (12:06 +0100)
commitaa966490b0309bdecb56a114dc68b9dc7fbe3d2d
tree05c7724f1f4dd97abec7c4743b3bdc45a502a118
parent1aae7216cdb9b022837a5a816bf68b21744ba6bc
parent0f2962d7d0164c415599f9b39c229bb9e69b98b6
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2