merge with master and resolve more conflicts

This commit is contained in:
louisremi 2011-04-12 11:29:25 +02:00
commit a5604aedb7
19 changed files with 322 additions and 87 deletions

View file

@ -807,7 +807,7 @@ jQuery.checkState = function(){
jQuery.removeData(this, "olddisplay", true);
start();
}
};
// Chaining Tests
test("Chain fadeOut fadeIn", function() {