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

Simple merge