Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Thu, 15 Jan 2009 19:04:31 +0000 (20:04 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 15 Jan 2009 19:04:31 +0000 (20:04 +0100)
commite6992480e2e0cf965650f84aa97e01fe0fa71544
treeb4c1743a8f99d22788e190b46f5cb1c09b9b50bb
parent48de7f9c7b387ca9f21294b47efc58e7dd64c6ad
parent63fe022602b622eb80bd38d64ee272b543ce0418
Merge commit 'upstream/master' into prv/po

Conflicts:

debian/control
debian/control