[erlang-js/f21: 2/2] Merge branch 'master' into f21

[Peter Lemenkov]

commit 99491975ca4f9c355a2a2abf514556984fffcf0c
Merge: bbae986 1b03031
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Nov 16 23:47:23 2014 +0300

    Merge branch 'master' into f21

 .gitignore                                         |    1 +
 ...-js-0001-Fix-building-of-linked-in-driver.patch |  108 ++++++++------------
 erlang-js-0002-Build-with-js-1.7.0.patch           |   80 ---------------
 erlang-js-0002-build-fix-for-js-1.8.5.patch        |    9 +--
 ...-Use-mochiweb-instead-of-a-bundled-copies.patch |   44 +++-----
 ...recated-driver_output_term-with-erl_drv_o.patch |   29 +++++
 erlang-js.spec                                     |   19 +++-
 sources                                            |    2 +-
 8 files changed, 104 insertions(+), 188 deletions(-)
---