Merge remote-tracking branch 'cjdelisle/xwiki-phantomjs-test-failures'

Conflicts: src/jio.storage/xwikistorage.js test/jiotests.js

Merge remote-tracking branch 'cjdelisle/xwiki-phantomjs-test-failures'
Conflicts: src/jio.storage/xwikistorage.js test/jiotests.js
ac7b4ae5 · Tristan Cavelier · 3dbe62ac · d24fe545 · ac7b4ae5 · ac7b4ae5
Commit ac7b4ae5 authored May 20, 2013 by Tristan Cavelier
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 614 additions and 1158 deletions

src/jio.storage/xwikistorage.js src/jio.storage/xwikistorage.js +614 -572

test/jiotests.js test/jiotests.js +0 -586

No files found.
--- a/src/jio.storage/xwikistorage.js
+++ b/src/jio.storage/xwikistorage.js
--- a/test/jiotests.js
+++ b/test/jiotests.js