Merge branch 'master' into graceful_stop
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Apr 2012 12:30:19 +0000 (14:30 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Apr 2012 12:30:19 +0000 (14:30 +0200)
commit39c94a0ea4e457d63823a7fb3601fcf0a889cc66
treefaec57ce4f89d6a6e34d647df24623240f8d3bd8
parent514dca32f3830f498c3bb7566e238dbb9b12d67c
parentc926fbcbd8adcc1abf1a1527860bb9f23aa0c43a
Merge branch 'master' into graceful_stop