Merge branch 'master' into fetch_more
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 25 Feb 2013 10:19:09 +0000 (11:19 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 25 Feb 2013 10:19:09 +0000 (11:19 +0100)

Trivial merge