[Merge] lp:~laney/gimp/gimp-2.6.11-2-merge into lp:~ubuntu-desktop/gimp/ubuntu

[Daniel Holbach]

It might be worth to use dh-translations at some stage, but apart from that it looks good. I'll wait for my build to succeed before I upload it though.
-- 
https://code.launchpad.net/~laney/gimp/gimp-2.6.11-2-merge/+merge/59887
Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~laney/gimp/gimp-2.6.11-2-merge into lp:~ubuntu-desktop/gimp/ubuntu.