Merge branch 'master' into graceful_stop
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Apr 2012 13:31:29 +0000 (15:31 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Apr 2012 13:31:29 +0000 (15:31 +0200)

Trivial merge