merge from trunk


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