[Pkg-javascript-commits] [ltx] 37/80: Merge commit 'upstream/0.1.2'

[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 6f032094dc42a0406cc050891962f57e25d8c1ac
Merge: 230e893 f1077ab
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Dec 22 20:15:54 2011 +0700

    Merge commit 'upstream/0.1.2'

 .travis.yml                               |  4 +++
 lib/element.js                            | 47 ++++++++++++++++++-------------
 package.json                              |  6 ++--
 test/{test_element.js => element-test.js} | 32 +++++++++++++++++++--
 test/{test_parse.js => parse-test.js}     |  6 +++-
 5 files changed, 69 insertions(+), 26 deletions(-)

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