tree 88cdc572b5357cc8b4c43e151dfd854e0137d97b
parent b4b91ad69751fe3e186c5cc85ced6dd677806f3a
author Michael Stroucken <stroucki@apache.org> 1344296246 +0000
committer Michael Stroucken <stroucki@apache.org> 1344296246 +0000

Merge branch 'assertionerror'

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