[SCM] stapler-adjunct-timeline packaging branch, master, updated. debian/1.3-1-4-ge013d45

[James Page]

The following commit has been merged in the master branch:
commit 245cd73e11dbfcfafb0cf83cb18d77c667f71870
Merge: 0f615633f310e6afbc963fe389a58440e411a746 2f16ee10868f3a043d4c6eb7e01fdd1869433e31
Author: James Page <james.page at canonical.com>
Date:   Fri Oct 28 08:50:38 2011 +0100

    Merge commit 'upstream/1.3+dfsg'


-- 
stapler-adjunct-timeline packaging