Merge branch 'master' into upnp_client
authorBertrand Lorentz <bertrand.lorentz@gmail.com>
Sat, 14 Jan 2012 12:08:31 +0000 (13:08 +0100)
committerBertrand Lorentz <bertrand.lorentz@gmail.com>
Sat, 14 Jan 2012 15:59:03 +0000 (16:59 +0100)
commit402e7895260a3e9c768ce56141a0689d143d20c5
tree7f85de5eee43b157b005700f74c0fca460f07757
parent822baedde916cca8251b4498d1b62a2f74fd9ca1
parentc185610050313d3715e1f66a7ee9d203f4291e96
Merge branch 'master' into upnp_client

Conflicts:
Banshee.sln
Banshee.sln
build/build.environment.mk
configure.ac
data/addin-xml-strings.cs
src/Extensions/Makefile.am