Merge with latest master from upstream. Fix merge conflict with Leiningen.gitignore

This commit is contained in:
Sean Brewer
2013-11-07 21:50:41 -05:00
62 changed files with 293 additions and 111 deletions

View File

@@ -5,3 +5,4 @@ pom.xml
/targets/
.lein-deps-sum
.lein-repl-history
.lein-plugins/