merge

2011-06-20 08:46:37 -07:00
parent b640ce6fc0 e9af7834f5
commit c0664dd6aa
32 changed files with 16189 additions and 141 deletions
--- a/src/version.js
+++ b/src/version.js
@@ -2,6 +2,6 @@ jasmine.version_= {
  "major": 1,
  "minor": 1,
  "build": 0,
-  "revision": 1308359945,
+  "revision": 1308584756,
  "rc": 1
 };