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. doc/
  2. etc/
  3. src/
  4. DISCLAIMER
  5. INSTALL
  6. LICENSE
  7. Makefile
  8. NOTICE
  9. README