[Pkg-javascript-commits] [highlight.js] 01/10: Merge tag 'upstream/7.4+ds'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository highlight.js.

commit 078cb18adf2e4a783111ba326fb79a51a461af38
Merge: 54a5724 a748c0a
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Feb 19 00:37:08 2014 +0100

    Merge tag 'upstream/7.4+ds'
    
    Upstream version 7.4+ds


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