Merge branch 'master' of ssh://istirbu@repo.or.cz/srv/git/debian-ro-repo
commit2d70065175c804d19e2ef427521f79288dcd5d5b
authorIgor Știrbu <igor.stirbu@gmail.com>
Tue, 3 Feb 2009 17:09:31 +0000 (3 19:09 +0200)
committerIgor Știrbu <igor.stirbu@gmail.com>
Tue, 3 Feb 2009 17:09:31 +0000 (3 19:09 +0200)
treede8bba17ad5ce8dd63505d9a14cba890344ea40a
parentdc80eb4f807a04a3764378bfc25c9500b0f4034a
parent87f2fe71c338cbc907177679c9bdabc0c215dbd4
Merge branch 'master' of ssh://istirbu@repo.or.cz/srv/git/debian-ro-repo

Conflicts:

release-notes/upgrading.po
release-notes/upgrading.po