[Merge] lp:~timo-jyrinki/ubuntu/trusty/lmms/lmms_1.0.0+stable_uploaded into lp:ubuntu/trusty/lmms

[Timo Jyrinki]

Timo Jyrinki has proposed merging lp:~timo-jyrinki/ubuntu/trusty/lmms/lmms_1.0.0+stable_uploaded into lp:ubuntu/trusty/lmms.

Requested reviews:
  Ubuntu branches (ubuntu-branches)
Related bugs:
  Bug #1335542 in lmms (Ubuntu Trusty): "Trusty LMMS version is based off wrong branch"
  https://bugs.launchpad.net/ubuntu/trusty/+source/lmms/+bug/1335542

For more details, see:
https://code.launchpad.net/~timo-jyrinki/ubuntu/trusty/lmms/lmms_1.0.0+stable_uploaded/+merge/235576

Continuation from https://code.launchpad.net/~israeldahl/ubuntu/trusty/lmms/lmms_1.0.0+stable/+merge/225778
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~timo-jyrinki/ubuntu/trusty/lmms/lmms_1.0.0+stable_uploaded/+merge/235576
Your team Ubuntu branches is requested to review the proposed merge of lp:~timo-jyrinki/ubuntu/trusty/lmms/lmms_1.0.0+stable_uploaded into lp:ubuntu/trusty/lmms.
-------------- 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/20140923/ce8772c1/attachment-0001.diff>