Merge branch 'rename'
authorStefan Huber <shuber2@gmx.at>
Tue, 22 May 2012 07:25:32 +0000 (09:25 +0200)
committerStefan Huber <shuber2@gmx.at>
Tue, 22 May 2012 07:25:32 +0000 (09:25 +0200)
Conflicts:
sitarba


Trivial merge