Merge branch 'master' into graceful_stop
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 25 Apr 2012 09:14:36 +0000 (11:14 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 25 Apr 2012 09:14:36 +0000 (11:14 +0200)
commitcdeefa2a50b80f85d2acb5d238ef70d4baebb457
treea1bd6cf0ea93a4cbb243d25f20603247cd028d13
parent84c5e997dc7d9775959c953f64a330eac18a0d00
parent99592aa50f9ebdf033ddf3c576a34c6a12f81324
Merge branch 'master' into graceful_stop