[Merge] lp:~l3on/ubuntu/saucy/amule-adunanza/upstream-2012.1+2.3.1 into lp:ubuntu/amule-adunanza

[Iain Lane]

I'm setting this as Work In Progress but please reset to Needs Review once it can move on. Thanks!
-- 
https://code.launchpad.net/~l3on/ubuntu/saucy/amule-adunanza/upstream-2012.1+2.3.1/+merge/186940
Your team Ubuntu branches is requested to review the proposed merge of lp:~l3on/ubuntu/saucy/amule-adunanza/upstream-2012.1+2.3.1 into lp:ubuntu/amule-adunanza.