Viewing all changes in revision 461.

Committer: CI bot
Author(s): Ted Gould
Date: 2014-11-05 17:56:17 UTC
mfrom: <a title="Merged From 460.2.9" href="/~ps-jenkins/indicator-sound/ubuntu-vivid-proposed/revision/460.2.9">(460.2.9 mega-merge)
Revision ID: ps-jenkins@lists.canonical.com-20141105175617-xoz3kmwa537vwaz0

Manually merging branches to resolve conflicts Fixes: 1358340, 1373404, 1378564, 1378961, 1381871
Approved by: PS Jenkins bot

added added

removed removed