tree 4b071ab74669973bcf5c818cb57c0e49e51626a8
parent fa56fd0a67a9c3893c7631f9630e0d55452536d8
author Michael Stroucken <stroucki@apache.org> 1330482295 +0000
committer Michael Stroucken <stroucki@apache.org> 1330482295 +0000

merge from trunk


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