tree 33ec5a04f1267a3c3527c7b88d5c4e16bd4e0b15
parent e8155c64df653e02b91744ab6bd56982884f9fbd
author Michael Stroucken <stroucki@apache.org> 1343937938 +0000
committer Michael Stroucken <stroucki@apache.org> 1343937938 +0000

Merge branch 'autoregister'

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