Add Eclipse-specific files to .gitignore
Fix pprint problem (CLJ-1076)
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://mikera@github.com/mikera/clojure.git
Merge remote-tracking branch 'upstream/master'
ignore classes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	test/clojure/test_clojure/pprint/test_pretty.clj
Merge branch 'master' of https://mikera@github.com/mikera/clojure.git