[Merge] lp:~bkerensa/ubuntu/trusty/torque/merge-from-debian into lp:debian/torque

[Benjamin Kerensa]

Benjamin Kerensa has proposed merging lp:~bkerensa/ubuntu/trusty/torque/merge-from-debian into lp:debian/torque.

Requested reviews:
  Ubuntu branches (ubuntu-branches)

For more details, see:
https://code.launchpad.net/~bkerensa/ubuntu/trusty/torque/merge-from-debian/+merge/192388

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