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
..
lein	Merge branch '1.x'	2011-11-12 13:46:59 -08:00
lein-pkg	Release 1.6.2.	2011-11-12 11:30:55 -08:00
lein.bat	Merge branch '1.x'	2011-11-12 13:46:59 -08:00