From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 14 Jul 2010 20:45:54 +0000 (-0400)
Subject: Merge branch 'master' of github.com:jquery/jquery-ui
X-Git-Tag: 1.8.3~42
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6b36499c71991eb6a5a3aab14d2401e1e9ca2f2c;p=jquery-ui.git

Merge branch 'master' of github.com:jquery/jquery-ui

Conflicts:
	tests/unit/dialog/dialog_defaults.js
---

6b36499c71991eb6a5a3aab14d2401e1e9ca2f2c