Merge branch 'master' of github.com:devbridge/jQuery-Autocomplete

Tomas Kirda · Tomas Kirda · commit 2ec23c191df3 · 2013-01-20T19:30:58.000-06:00
Conflicts:
	dist/jquery.autocomplete.js
	dist/jquery.autocomplete.min.js
diff --git a/dist/jquery.autocomplete.js b/dist/jquery.autocomplete.js
@@ -1,4 +1,5 @@
 /**
+*  Ajax Autocomplete for jQuery, version 1.2.1
 *  Ajax Autocomplete for jQuery, version 1.2.2
 *  (c) 2013 Tomas Kirda
 *

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`/**`
	`2`	`+* Ajax Autocomplete for jQuery, version 1.2.1`
`2`	`3`	`* Ajax Autocomplete for jQuery, version 1.2.2`
`3`	`4`	`* (c) 2013 Tomas Kirda`
`4`	`5`	`*`