Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 29 Apr 2011 11:26:48 +0000 (11:26 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 29 Apr 2011 11:26:48 +0000 (11:26 +0000)
Conflicts:
IDMETA


Trivial merge