Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/yazpp
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 12 Nov 2012 13:47:11 +0000 (14:47 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 12 Nov 2012 13:47:11 +0000 (14:47 +0100)

Trivial merge