From: Heikki Levanto <heikki@indexdata.dk>
Date: Fri, 8 May 2015 14:21:16 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mp-sparql
X-Git-Tag: v0.6~25
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=ec60d1c47f01721246b5a85aae6757beef0093d2;p=mp-sparql-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mp-sparql

Conflicts:
	bibframe/triplestore.xml
---

ec60d1c47f01721246b5a85aae6757beef0093d2