tree 0c0f53025edc8b5829b7d268e03694d17b620b8a
parent 1ad511c39c190724fe909ae7b4bd6a4671adaa57
author Michael Stroucken <stroucki@apache.org> 1340159113 +0000
committer Michael Stroucken <stroucki@apache.org> 1340159113 +0000

merge trunk-staging with luke-zoni


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