)]}'
{
  "commit": "f3a5bdcb0d893f5801fcc5c8d8d86bb094a1996a",
  "tree": "5f133d4bd2cae52f3430c1cc5c7cff612f8e8d0a",
  "parents": [
    "e586da33059a84dcdd5424eb0d3e97c6e59b4992",
    "f5f04a38a0f4afd63dce2f22bbe5935847e2b51e"
  ],
  "author": {
    "name": "Ingo Weigelt",
    "email": "iw@wglt.de",
    "time": "Tue Dec 16 12:38:49 2014 +0100"
  },
  "committer": {
    "name": "Ingo Weigelt",
    "email": "iw@wglt.de",
    "time": "Tue Dec 16 12:38:49 2014 +0100"
  },
  "message": "Merge branch \u0027develop\u0027 into filtersearch\n\nConflicts:\n\torg.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/AbstractFilterTest.java\n\torg.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/StringFilterTest.java\n\torg.eclipse.rmf.reqif10.search.ui/plugin.properties\n\torg.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlBoolean.java\n\torg.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlDate.java\n\torg.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlEnum.java\n\torg.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlNumber.java\n\torg.eclipse.rmf.reqif10.search.ui/src/org/eclipse/rmf/reqif10/search/filter/ui/FilterControlString.java\n\torg.eclipse.rmf.reqif10.search/src/org/eclipse/rmf/reqif10/search/filter/AbstractAttributeFilter.java\n\torg.eclipse.rmf.reqif10.search/src/org/eclipse/rmf/reqif10/search/filter/BoolFilter.java\n\torg.eclipse.rmf.reqif10.search/src/org/eclipse/rmf/reqif10/search/filter/DateFilter.java\n\torg.eclipse.rmf.reqif10.search/src/org/eclipse/rmf/reqif10/search/filter/EnumFilter.java\n\torg.eclipse.rmf.reqif10.search/src/org/eclipse/rmf/reqif10/search/filter/IFilter.java\n\torg.eclipse.rmf.reqif10.search/src/org/eclipse/rmf/reqif10/search/filter/SimpleCompoundFilter.java\n\torg.eclipse.rmf.reqif10.search/src/org/eclipse/rmf/reqif10/search/filter/XhtmlFilter.java\n\tspecifications/reqif/Search.reqif\n",
  "tree_diff": []
}