Merge branch 'master' into hide_errors
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 28 Feb 2012 13:43:48 +0000 (14:43 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 28 Feb 2012 13:43:48 +0000 (14:43 +0100)

Trivial merge