tree 8d3bf2594ed5cb9efa0da70f87603612863b832c
parent 39fc165194ba7717e1085e89563fa63be93f624a
author Michael Stroucken <stroucki@apache.org> 1331153307 +0000
committer Michael Stroucken <stroucki@apache.org> 1331153307 +0000

Merge branch 'stroucki-releasebugs'

Conflicts:
	src/tashi/util.py

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