Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mp-sparql
authorHeikki Levanto <heikki@indexdata.dk>
Fri, 8 May 2015 14:21:16 +0000 (16:21 +0200)
committerHeikki Levanto <heikki@indexdata.dk>
Fri, 8 May 2015 14:21:16 +0000 (16:21 +0200)
Conflicts:
bibframe/triplestore.xml


Trivial merge