Phil Hagelberg 3b02d41e83 Merge branch '1.x' ... Conflicts: README.md bin/lein bin/lein-pkg bin/lein.bat doc/PLUGINS.md pom.xml project.clj src/leiningen/compile.clj src/leiningen/trampoline.clj todo.org		2011-11-12 13:46:59 -08:00
..
leiningen/test	Merge branch '1.x'	2011-11-12 13:46:59 -08:00
sample-index.zip	Merge search task into mainlein. (har har)	2011-05-04 18:07:53 -07:00