Docky

Merge proposals dependent on lp://staging/~franciscoda/docky/nm-1.0.7-docky-fix

  1. nm-1.0.7-docky-fix
  2. Dependent merge proposals

lp://staging/~franciscoda/docky/nm-1.0.7-docky-fix has no merge proposals.