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)
commit207d81ff3a5012639ae13be8470856b1a1ddc7ac
tree68e2a91c1e3bc5210eba64f0298ecf9e6f863170
parentb18206069603ac998a32df933b60f3645ccbed13
parenta585f311a72f239ecc7d87218a0a35978d11133e
Merge branch 'rename'

Conflicts:
sitarba