Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 5 Nov 2015 11:48:53 +0000 (12:48 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 5 Nov 2015 11:48:53 +0000 (12:48 +0100)

Trivial merge