From: Stefan Huber <shuber2@gmx.at>
Date: Tue, 22 May 2012 07:25:32 +0000 (+0200)
Subject: Merge branch 'rename'
X-Git-Tag: v2.0-rc2~1
X-Git-Url: https://git.sthu.org/?p=sitarba.git;a=commitdiff_plain;h=207d81ff3a5012639ae13be8470856b1a1ddc7ac

Merge branch 'rename'

Conflicts:
	sitarba
---

207d81ff3a5012639ae13be8470856b1a1ddc7ac