[Merge] lp:ubuntu/wily-proposed/kazam into lp:kazam

[David Klasinc]

David Klasinc has proposed merging lp:ubuntu/wily-proposed/kazam into lp:kazam.

Requested reviews:
  David Klasinc (bigwhale)
Related bugs:
  Bug #1500083 in kazam (Ubuntu): "kazam [1.4.5 and 1.5.3] crashed with TypeError in _interpolate_some(): get() got an unexpected keyword argument 'raw'"
  https://bugs.launchpad.net/ubuntu/+source/kazam/+bug/1500083

For more details, see:
https://code.launchpad.net/~ubuntu-branches/ubuntu/wily/kazam/wily-proposed/+merge/274246

Merging downstream fixes.
-- 
The attached diff has been truncated due to its size.
Your team Ubuntu branches is subscribed to branch lp:ubuntu/wily-proposed/kazam.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 524288 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20151013/43854d11/attachment-0001.diff>