Merge branch 'gh-pages' of https://github.com/kangax/html-minifier into issue381-svg
authorThomas Genin <tgenin@expensify.com>
Tue, 17 Nov 2015 23:16:16 +0000 (15:16 -0800)
committerThomas Genin <tgenin@expensify.com>
Tue, 17 Nov 2015 23:16:16 +0000 (15:16 -0800)
commite17c9059feaa9487e4644cc144713a6944b176ab
treedd767a823b5519213a4169f5f226cab476c35c10
parent9f550e1da2bc181037e7aa9ba741853be4393edd
parent10b82f5974ba6fbd6527cec08550db2f190c8d7e
Merge branch 'gh-pages' of https://github.com/kangax/html-minifier into issue381-svg

 Conflicts:
package.json
cli.js
package.json