[Pkg-javascript-commits] [simile-timeline] 03/05: Merge branch 'upstream'

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository simile-timeline.

commit 0b55c8ae0be5638223a7ebc4d10db5c9d5fbb0b3
Merge: d801416 d5954af
Author: W. Martin Borgert <debacle at debian.org>
Date:   Fri Aug 21 16:05:39 2015 +0200

    Merge branch 'upstream'


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/simile-timeline.git