[Merge] lp:~james-page/ubuntu/oneiric/jcaptcha/827651 into lp:ubuntu/jcaptcha

[James Page]

James Page has proposed merging lp:~james-page/ubuntu/oneiric/jcaptcha/827651 into lp:ubuntu/jcaptcha.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #827651 in jcaptcha (Ubuntu): "Jenkins fails to start if libservlet2.5-java are installed on the system"
  https://bugs.launchpad.net/ubuntu/+source/jcaptcha/+bug/827651

For more details, see:
https://code.launchpad.net/~james-page/ubuntu/oneiric/jcaptcha/827651/+merge/72025

Remove servlet-api-2.5.jar from generated MANIFEST Class-Path as this should always be provided and generated class conflicts when it is.
-- 
https://code.launchpad.net/~james-page/ubuntu/oneiric/jcaptcha/827651/+merge/72025
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~james-page/ubuntu/oneiric/jcaptcha/827651 into lp:ubuntu/jcaptcha.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1712 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20110818/29cf6e28/attachment.diff>