Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 27 Oct 2014 14:17:40 +0000 (14:17 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 27 Oct 2014 14:17:40 +0000 (14:17 +0000)
Conflicts:
IDMETA


Trivial merge