Merge branch 'master' into java6

Conflicts:
	project.clj
This commit is contained in:
Gered 2014-03-22 16:43:58 -04:00
commit a3a4d7747b

View file

@ -4,4 +4,4 @@
:license {:name "Apache License, Version 2.0"
:url "http://www.apache.org/licenses/LICENSE-2.0"}
:dependencies [[org.clojure/clojure "1.5.1"]
[com.lyncode/jtwig-core-java6 "2.1.1"]])
[com.lyncode/jtwig-core "2.1.2"]])