Merge branch 'master' into graceful_stop
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Apr 2012 12:40:26 +0000 (14:40 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Apr 2012 12:40:26 +0000 (14:40 +0200)
commit11189d6e01308c7326d8a2c091e61bb79ba38d08
tree9e7fb7e1557476ff3e252bb4be21bc1627317080
parent5dddeb732a1409f9787cbdb3ce993f73a47f2dcc
parente3dbcafe1fcd29d98138b20dc82e8fc4e80d66d0
Merge branch 'master' into graceful_stop