Merge "daemon: Implement much-logged-about negotiations"
commit4e9689aac297bac1d5f0c517a7119bd7dfc30aba
authorRobin Sonefors <robin.sonefors@op5.com>
Wed, 25 Jun 2014 14:58:20 +0000 (25 16:58 +0200)
committerGerrit Code Review <gerrit@devel.dev.op5.com>
Wed, 25 Jun 2014 14:58:20 +0000 (25 16:58 +0200)
tree55e815b25db7d10c5cf4e8bd72253ad93c5adf0e
parent9d639bf180405ace91e8ca6f2648b1bd2abee9c8
parentb9761d9dfec3d197e7a2a37aebbe98ea726f4356
Merge "daemon: Implement much-logged-about negotiations"