removing version range for phantomjs and sticking with 1.8.2-0 until https://github.com/Obvious/phantomjs/issues/40 is resolved
Upgrading to phantomjs 1.9.0-1 to fix issue

Fixes the issue seen in #17 by upgrading to the new phantomjs version
that has a new unzip package dependency
upped version of phantomjs, updated changelog/readme
0.3.0
make onLoadFinished a no-op after the first callback, for iframes in phantom
The "inject" option may now also be an Array. Closes gh-26.

* Valid values: (String) file path or Array of (String) file paths.
Explicitly define contents of npm package
update links in readme to reflect updates to the qunit task.
Merge pull request #30 from patrickkettner/patch-1

update links in readme to reflect updates to the qunit task.
Merge pull request #1 from gruntjs/master

pulling latest master
bumping version
Always display spawn errors to stderr. Closes GH-33.
[Readme] os deps
Update copyright 2013
Update jshint
Return full request for onResourceRequested
Merge branch 'master' of https://github.com/jaredstehler/grunt-lib-phantomjs into jaredstehler-master

* 'master' of https://github.com/jaredstehler/grunt-lib-phantomjs:
  bumping version
  make onLoadFinished a no-op after the first callback, for iframes in phantom
updated docs
Merge remote-tracking branch 'original/master' into merge-from-upstream

* original/master:
  updated docs
  Return full request for onResourceRequested
  Update jshint
  Update copyright 2013
  [Readme] os deps
  Always display spawn errors to stderr. Closes GH-33.
  bumping version
  update links in readme to reflect updates to the qunit task.
  Explicitly define contents of npm package
  The "inject" option may now also be an Array. Closes gh-26.
  make onLoadFinished a no-op after the first callback, for iframes in phantom
  0.3.0
  upped version of phantomjs, updated changelog/readme
  Upgrading to phantomjs 1.9.0-1 to fix issue
  removing version range for phantomjs and sticking with 1.8.2-0 until https://github.com/Obvious/phantomjs/issues/40 is resolved

Conflicts:
	README.md
	package.json
	phantomjs/main.js
Merge pull request #1 from oddbird/merge-from-upstream

Merge from upstream