)]}'
{
  "commit": "d3dfa412d7f20ca4dc540922537be8e1f3dce094",
  "tree": "406c481459d946b563b6168187b7aba44fa18766",
  "parents": [
    "c28a9bebcf78dc077f1313504035a9db3cecbcad",
    "e6a34a588cbfec3b900de463ae0568f1743d0203"
  ],
  "author": {
    "name": "slewis",
    "email": "slewis@composent.com",
    "time": "Thu Jun 12 13:08:41 2014 -0700"
  },
  "committer": {
    "name": "slewis",
    "email": "slewis@composent.com",
    "time": "Thu Jun 12 13:08:41 2014 -0700"
  },
  "message": "Merge remote-tracking branch \u0027origin/master\u0027 into 424059\n\nConflicts:\n\tframework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF\n\tosgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java\n\tproviders/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF\n\nmerged manually by sbl\n\nChange-Id: If086dde4fffb137f44a48d183f6280f068c8eb17\n",
  "tree_diff": []
}