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)
commitec731ac88ea0b433a25157d9b5189cdac99f1767
tree98854806ad434cca39ed19b58389d75ba3ee9ff6
parent0d7001c60152b42f6b750610c8ae73c2dc4ee5a9
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