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)
commitec60d1c47f01721246b5a85aae6757beef0093d2
tree37ac3dd7b9a67bc9227b79b8b40990072d272f42
parenta9c97a12f169b4ae788da1593911e4a8380cfb58
parent0fc331d6e264de65af7b438316c2f1134a5fdf23
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mp-sparql

Conflicts:
bibframe/triplestore.xml