)]}'
{
  "commit": "78a63ddfea66014cea68a4f7541a0770e358cf68",
  "tree": "39dc954c22a4b2657552a1d41462f4919b777c66",
  "parents": [
    "dfd895e35147953d362b29b78123f8558e57d684",
    "f855f399f8ce740e08ddc48c0694c1c076fa69dd"
  ],
  "author": {
    "name": "Shawn O. Pearce",
    "email": "sop@google.com",
    "time": "Thu Aug 12 16:42:02 2010 -0700"
  },
  "committer": {
    "name": "Shawn O. Pearce",
    "email": "sop@google.com",
    "time": "Thu Aug 12 16:42:02 2010 -0700"
  },
  "message": "Merge branch \u0027master\u0027 into exp-nosql\n\n* master:\n  Fix all of our pom.xml versions to be 2.1-SNAPSHOT\n  Use internal templates to simplify minor formatting commands.\n  Convert 3 email classes to file based templates.\n  Convert the Abandoned and MergeFail email classes to templates\n  Use a template to set the contents of the CommentEmails.\n  Use a template to set the footer on ChangeEmails.\n  Use a template to set the contents of the MergedEmails.\n  Use a template to set the subject line.\n  Add framework for using velocity templates in email classes\n  Add ability to deactivate a user when they leave the project.\n\nConflicts:\n\tgerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java\n\tgerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java\n\tgerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java\n\tgerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java\n\tgerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java\n\tgerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java\n\nChange-Id: Iac92b56e10f9cc4063fc0ec3cea6c79a5a087994\n",
  "tree_diff": []
}
