[SCM] jenkins-executable-war packaging branch, master, updated. debian/1.22-1-3-g947bd37

[James Page]

The following commit has been merged in the master branch:
commit ae016a1dcb92d7de55f6aa06caff26da79b1c719
Merge: ace816c5e4758687719f9f87e8daf3d822b0a830 3038c7d3eeb45bb32b54c1eccb08b316808636a9
Author: James Page <james.page at ubuntu.com>
Date:   Wed Jan 11 17:31:44 2012 +0100

    Merge commit 'upstream/1.25'


-- 
jenkins-executable-war packaging