Merge branch 'master' into dbus-sharp
Conflicts: build/pkg-config/banshee-core.pc.in src/Backends/Banshee.Hal/Banshee.Hal.csproj src/Backends/Banshee.Hal/Banshee.HalBackend/DkDisk.cs src/Backends/Banshee.Hal/Hal/Device.cs src/Backends/Banshee.Hal/Hal/Manager.cs src/Backends/Banshee.Hal/Hal/Volume.cs src/Hyena
Please register or sign in to comment