[Pkg-javascript-commits] [ltx] 274/469: Merge branch 'fix_sax_ltx' of git://github.com/astro/ltx

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository ltx.

commit 34ef6fc167012fbb3e1e927d8c92d8658bce4154
Merge: 758cd64 1bbcd83
Author: ▟ ▖▟ ▖ <dodo.the.last at gmail.com>
Date:   Tue Nov 12 23:36:24 2013 +0100

    Merge branch 'fix_sax_ltx' of git://github.com/astro/ltx
    
    Conflicts:
    	test/parse-test.js

 lib/sax_ltx.js     | 2 +-
 test/parse-test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


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