Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 29 Oct 2013 17:11:47 +0000 (18:11 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 29 Oct 2013 17:11:47 +0000 (18:11 +0100)

Trivial merge