Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Jan 2012 11:22:49 +0000 (12:22 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Jan 2012 11:22:49 +0000 (12:22 +0100)

Trivial merge