From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 15 Nov 2011 10:27:02 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.6.6~13^2~7
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=ee0c5796c67648c25249bf34c035d512f98e87b4;hp=ee0c5796c67648c25249bf34c035d512f98e87b4;p=pazpar2-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
	www/iphone/example_client.js

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