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)
commit027ebb5197840e639e963f3ca477746f8598d698
tree37f815491342358eb8a53b0e30a01b6708b96d7f
parent5b13052f4b5e568e3511d87c2e20c5332fc7db91
parent3552169fcc031ee61f606d8b1b7bf1503085d47b
Merge branch 'master' into graceful_stop