merge conflicts

.gitignore

@@ -1,4 +1,8 @@
 build
+site
+www
+builder
+jquerytools.github.com
 
 # patch
 *.rej

CHANGELOG.md

@@ -0,0 +1,12 @@
+# 1.2.6
+#### Sept 15, 2011
+
+  - Fixed animation queue issue when switching tabs in both autoscroll and slideshow plugins [#447](https://github.com/jquerytools/jquerytools/issues/447)
+  - Native browser validation is now disabled in validator to avoid compatibility issues [#334](https://github.com/jquerytools/jquerytools/issues/334)
+  - Dateinput now has `beforeChange` event and triggers `change` appropriately [#292](https://github.com/jquerytools/jquerytools/issues/292)
+  - Tooltip fade bugfix for IE [#363](https://github.com/jquerytools/jquerytools/issues/363)
+  - Rangeinput vertical position calculations are fixed [#463](https://github.com/jquerytools/jquerytools/issues/463)
+  - Horizontal accordion works again with smoother animation [#327](https://github.com/jquerytools/jquerytools/issues/327)
+  - Tabs with history plugin work once again [#261](https://github.com/jquerytools/jquerytools/issues/261)
+  - Added size parameter back to scrollable [#58](https://github.com/jquerytools/jquerytools/issues/58)
+  - Dateinput forward/back buttons no longer calculate the wrong date *in some cases* [#476](https://github.com/jquerytools/jquerytools/pull/476)

README.md

@@ -6,7 +6,7 @@ jQuery Tools is a collection of the most important user-interface components for
 ##Contributing
 
 Please issue pull requests to the [dev branch](https://github.com/jquerytools/jquerytools/tree/dev).  
+
 This is where active development takes place, we then merge changes into master for releases. That will become v1.2.6. 
 Most of the development goes to 2.0 which is currently a private repository.
 
-