merge record before deleting this branch


git-svn-id: https://svn.apache.org/repos/asf/incubator/tashi/branches/stroucki-accounting@1295397 13f79535-47bb-0310-9956-ffa450edef68
tree: dfb475806d7fcf764037288d60bb2202ced6bbe3
  1. DISCLAIMER
  2. INSTALL
  3. LICENSE
  4. Makefile
  5. NOTICE
  6. README
  7. doc/
  8. etc/
  9. src/