[Merge] lp:~james-page/ubuntu/natty/cobbler/fix-760012 into lp:ubuntu/cobbler

[James Page]

James Page has proposed merging lp:~james-page/ubuntu/natty/cobbler/fix-760012 into lp:ubuntu/cobbler.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #760012 in cobbler (Ubuntu): "cobbler-web unnecessarily overrides default DocumentRoot"
  https://bugs.launchpad.net/ubuntu/+source/cobbler/+bug/760012

For more details, see:
https://code.launchpad.net/~james-page/ubuntu/natty/cobbler/fix-760012/+merge/57864
-- 
https://code.launchpad.net/~james-page/ubuntu/natty/cobbler/fix-760012/+merge/57864
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~james-page/ubuntu/natty/cobbler/fix-760012 into lp:ubuntu/cobbler.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 3474 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20110415/d677b91e/attachment.diff>