tree c35f03e1a18ad364206dda1ccb72b39ab87fbd83
parent 9c304e4553b0e07f6ee3c398728fa6cfabe75d3c
parent ad1c926dc54a6caa01bb310f007d19e498d7904c
author Michael Stroucken <stroucki@apache.org> 1328676983 +0000
committer Michael Stroucken <stroucki@apache.org> 1328676983 +0000

Merge stable branch from trunk


git-svn-id: https://svn.apache.org/repos/asf/incubator/tashi/branches/stable@1241776 13f79535-47bb-0310-9956-ffa450edef68