Merge branch 'master' of https://github.com/cryogen-project/cryogen · mba811/cryogen@a65f1ee · GitHub

Commit

Merge branch 'master' of https://github.com/cryogen-project/cryogen

Browse files

Conflicts:
	src/leiningen/new/cryogen/project.clj

Loading branch information

yogthos committed Jan 17, 2015

2 parents 2816697 + 63bc7a0 commit a65f1ee