[Merge] lp:~noskcaj/ubuntu/trusty/evas/merge into lp:ubuntu/evas

[Jackson Doak]

Jackson Doak has proposed merging lp:~noskcaj/ubuntu/trusty/evas/merge into lp:ubuntu/evas.

Requested reviews:
  Ubuntu branches (ubuntu-branches)

For more details, see:
https://code.launchpad.net/~noskcaj/ubuntu/trusty/evas/merge/+merge/203224

Merge from debian
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~noskcaj/ubuntu/trusty/evas/merge/+merge/203224
Your team Ubuntu branches is requested to review the proposed merge of lp:~noskcaj/ubuntu/trusty/evas/merge into lp:ubuntu/evas.
-------------- 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/20140126/afd72833/attachment-0001.diff>