Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 21 Aug 2012 12:43:26 +0000 (14:43 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 21 Aug 2012 12:43:26 +0000 (14:43 +0200)

Trivial merge