Merge branch 'hotfix/1218'
authorkristin <kristin@radicaldesigns.org>
Thu, 21 Jun 2012 03:53:37 +0000 (20:53 -0700)
committerkristin <kristin@radicaldesigns.org>
Thu, 21 Jun 2012 03:53:37 +0000 (20:53 -0700)
commitc31ca701421b3ca4b44ed10cf94ae3ea936d677d
tree9136fdd4d16b28a93251e17ddea063839c38789f
parented439d1a02e9a2b206e2151b9e15ef93f9b450cf
parent5c904483d107532e40cb2d2ff91d9d774d9c795a
Merge branch 'hotfix/1218'

Conflicts:
html/sites/all/libraries/jquery.ui/AUTHORS.txt
html/sites/all/libraries/jquery.ui/GPL-LICENSE.txt
html/sites/all/libraries/jquery.ui/MIT-LICENSE.txt
html/sites/all/libraries/jquery.ui/version.txt
html/sites/all/libraries/jquery.ui/AUTHORS.txt
html/sites/all/libraries/jquery.ui/GPL-LICENSE.txt
html/sites/all/libraries/jquery.ui/MIT-LICENSE.txt
html/sites/all/libraries/jquery.ui/version.txt