upstream/2.26+dfsg

Julian Taylor

@jtaylor

a0773742 · Merge tag 'upstream/2.26' into dfsg_clean · Apr 27, 2014

Dfsg upstream version 2.26