Merge branch Generic Foreign Key changes
authorJessica Tallon <tsyesika@tsyesika.se>
Wed, 24 Jun 2015 19:45:39 +0000 (21:45 +0200)
committerJessica Tallon <tsyesika@tsyesika.se>
Wed, 24 Jun 2015 19:45:39 +0000 (21:45 +0200)

Trivial merge