Merge branch 'master' of git@github.com:tipiirai/jquerytools

Tero Piirainen · Tero Piirainen · commit 93136a962723 · 2009-12-14T07:06:36.000Z
conflict fix

Conflicts:
	src/form/form.datepicker.js
diff --git a/src/form/form.datepicker.js b/src/form/form.datepicker.js
@@ -18,7 +18,7 @@
 */ 
 (function($) {	
 
-	$.tools = $.tools || {};	
+	$.tools = $.tools || {};
 	$.tools.form = $.tools.form || {};
 	
 	var instances = [], tool = $.tools.form.datepicker = {
