[Merge] lp:~pr-nizar/w3af/bug-1096580 into lp:ubuntu/trusty/w3af

[Brian Murray]

Review: Approve

This looks fine, although I've fixed the changelog entry to say vivid instead of UNRELEASED and linked to the ubuntu bug report using the LP: # syntax.  Additionally, if you'd like to see this fixed in Trusty and Utopic you'll need to follow the SRU process documented at http://wiki.ubuntu.com/StableReleaseUpdates.
-- 
https://code.launchpad.net/~pr-nizar/w3af/bug-1096580/+merge/248110
Your team Ubuntu branches is subscribed to branch lp:ubuntu/trusty/w3af.