Merge branch 'nan' of github.com:rvagg/node-expat
Merge branch 'master' of github.com:node-xmpp/node-expat
2.1.0