From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Thu, 14 Apr 2011 13:04:56 +0000 (+0200)
Subject: Merge 'new-vacation-notice-UI'
X-Git-Tag: v2.6~78
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=ec731ac88ea0b433a25157d9b5189cdac99f1767;p=libi2ncommon

Merge 'new-vacation-notice-UI'

Conflicts:
	intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.mo
	intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.po
---