Merge branch 'master' into http_file_raw
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 19 Jun 2013 09:44:09 +0000 (11:44 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 19 Jun 2013 09:44:09 +0000 (11:44 +0200)

Trivial merge