Merge branch 'master' into graceful_stop
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Apr 2012 13:21:56 +0000 (15:21 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Apr 2012 13:21:56 +0000 (15:21 +0200)
commit84c5e997dc7d9775959c953f64a330eac18a0d00
tree37970a8a23a5082b052ac5989f29c74c393a4848
parent39c94a0ea4e457d63823a7fb3601fcf0a889cc66
parent36e44f62ebd8f66995eb3a3f069ea024d63246dc
Merge branch 'master' into graceful_stop