Merge branch 'master' into graceful_stop
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Apr 2012 12:14:52 +0000 (14:14 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Apr 2012 12:14:52 +0000 (14:14 +0200)
commit514dca32f3830f498c3bb7566e238dbb9b12d67c
treec652659d2fbca7f1e3d596e70deedf0d427f3db5
parent027ebb5197840e639e963f3ca477746f8598d698
parent785f7d19f97f736688ab130ff78b990bb6c83595
Merge branch 'master' into graceful_stop