Merge branch '4.4' of git://gitorious.org/phonon/phonon into 4.4
authorHarald Sitter <sitter.harald@gmail.com>
Wed, 24 Nov 2010 18:21:13 +0000 (19:21 +0100)
committerHarald Sitter <sitter.harald@gmail.com>
Wed, 24 Nov 2010 18:21:13 +0000 (19:21 +0100)
commitfb48ced1d5e188daa3cf4ba634e177c27fbe3529
treecaca7701189ef0bc66bcb24a8f671f90982bad7c
parentd717606f5169eaa2d922169596e5c120a82ef765
parent8e96bbfb1ab4b1c75e4c417549fcc0d3ae9e2183
Merge branch '4.4' of git://gitorious.org/phonon/phonon into 4.4