[Pkg-javascript-commits] [node-expat] 313/371: Merge branch 'master' of github.com:node-xmpp/node-expat

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository node-expat.

commit a268b220545aca8ff2de4035745c6519b2a3b448
Merge: 2c91bee 0430e44
Author: Lloyd Watkin <lloyd at evilprofessor.co.uk>
Date:   Sun Feb 15 19:07:45 2015 +0000

    Merge branch 'master' of github.com:node-xmpp/node-expat
    
    Conflicts:
    	package.json

 .travis.yml     | 3 ++-
 README.markdown | 5 +++--
 package.json    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)


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