Permalink
Browse files

Merge remote branch 'loopj/master'

Conflicts:
	src/jquery.tokeninput.js
  • Loading branch information...
2 parents 0f08a33 + 3821fec commit a9b6e3b5f55b57358c0db9c386176ed7a327a2f1 @namxam namxam committed May 11, 2010
Showing with 0 additions and 0 deletions.

0 comments on commit a9b6e3b

Please sign in to comment.