Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Tue, 15 Nov 2011 10:27:02 +0000 (11:27 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 15 Nov 2011 10:27:02 +0000 (11:27 +0100)
Conflicts:
www/iphone/example_client.js

Fix: added md-author in branch. Added recIDs on head.


No differences found