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

Author Jonathan Bell <jbell@cs.columbia.edu>
Author date 2012-12-02 17:45:57
Author local date 2012-12-02 12:45:57 -0500
Committer Jonathan Bell <jbell@cs.columbia.edu>
Committer date 2012-12-02 17:45:57
Committer local date 2012-12-02 12:45:57 -0500
Commit 5642194e333d313a65febb262c51a6306de338a0
Tree fece786d9852a33c6b16198571f1993ad439731f
Parent 0113c98192ac7879778e9e368aae99b7f5ac5a1e
Parent 5a253395734838b497ebb100f7c2f1c694928cad
Merge branch 'master' of github.com:Programming-Systems-Lab/chroniclerj
Affected files: