[Merge] lp:~tribaal/ubuntu/utopic/ubumirror/1341523-upstream-release into lp:ubuntu/ubumirror

[Chris Glass]

Chris Glass has proposed merging lp:~tribaal/ubuntu/utopic/ubumirror/1341523-upstream-release into lp:ubuntu/ubumirror.

Requested reviews:
  Ubuntu branches (ubuntu-branches)
Related bugs:
  Bug #1341523 in ubumirror (Ubuntu): "New upstream release"
  https://bugs.launchpad.net/ubuntu/+source/ubumirror/+bug/1341523

For more details, see:
https://code.launchpad.net/~tribaal/ubuntu/utopic/ubumirror/1341523-upstream-release/+merge/226654

This branch pulls the code from the upstream 0.4 release into Ubuntu (see https://launchpad.net/ubumirror/trunk/0.4)

Notable changes are:

* Added an apache2 example config file.
* Fixed crontab example.
* Added a timeout configuration option.
* Normalized the behavior of the cdimage script. It now behaves like the
  other scripts.
-- 
https://code.launchpad.net/~tribaal/ubuntu/utopic/ubumirror/1341523-upstream-release/+merge/226654
Your team Ubuntu branches is requested to review the proposed merge of lp:~tribaal/ubuntu/utopic/ubumirror/1341523-upstream-release into lp:ubuntu/ubumirror.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 11353 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140714/8c184c00/attachment.diff>