[stapler-adjunct-timeline] 03/04: Merge tag 'upstream/1.4+dfsg'

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository stapler-adjunct-timeline.

commit 8401c0f2f9c318fd7ab20d8acab26fea32e2c7eb
Merge: 5440340 0354300
Author: James Page <james.page at ubuntu.com>
Date:   Mon Aug 12 10:05:59 2013 +0100

    Merge tag 'upstream/1.4+dfsg'
    
    Upstream version 1.4+dfsg


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/stapler-adjunct-timeline.git