tree fe3ba1ca80544051b4eb1559154cc73dc1e7ef58
parent 6b432018198536cd53d54b81bfed84745008f8a9
author Michael Stroucken <stroucki@apache.org> 1343362717 +0000
committer Michael Stroucken <stroucki@apache.org> 1343362717 +0000

Merge branch 'retrymerge'

Conflicts:
	src/tashi/client/tashi-admin.py

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