Merge 'new-vacation-notice-UI'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 14 Apr 2011 13:04:56 +0000 (15:04 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 14 Apr 2011 13:04:56 +0000 (15:04 +0200)
Conflicts:
intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.mo
intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.po


No differences found