Merge branch 'master' of github.com:Programming-Systems-Lab/chroniclerj

Author Jonathan Bell <jbell@cs.columbia.edu>
Author date 2012-12-13 23:33:22
Author local date 2012-12-13 18:33:22 -0500
Committer Jonathan Bell <jbell@cs.columbia.edu>
Committer date 2012-12-13 23:33:22
Committer local date 2012-12-13 18:33:22 -0500
Commit c2261028c6b8eb0e66a79f566fe7fd4d57cc5383
Tree ee5ef5eacd1009459235a9a026947314fda92afc
Parent 04283cef3bacd9c7c30eed43b817f9745aaeadbb
Parent 733dd937ef86464b79f6437b2088dd20adf5adbc
Merge branch 'master' of github.com:Programming-Systems-Lab/chroniclerj

Conflicts:
	Code/ChroniclerJ/src/edu/columbia/cs/psl/chroniclerj/CloningUtils.java
	Code/ChroniclerJ/src/edu/columbia/cs/psl/chroniclerj/replay/NonDeterministicReplayMethodVisitor.java
Affected files: