Merge branch 'master' into paz-732
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 14 Jun 2013 08:47:07 +0000 (10:47 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 14 Jun 2013 08:47:07 +0000 (10:47 +0200)

Trivial merge