Merge commit 'origin/master-tx' into master-tx

Conflicts:
	po/de.po
This commit is contained in:
Lennart Poettering 2008-10-07 21:38:06 +02:00
commit 5925d44013
7 changed files with 4503 additions and 134 deletions

2113
po/pl.po Normal file

File diff suppressed because it is too large Load diff