Fix up more conflicts.
[deb_shairplay.git] / autom4te.cache / requests
2014-11-25  Jérôme BenoitMerge branch 'master' of https://github.com/juhovh...
2014-11-25  Jérôme BenoitClean up the mess in the upstream branch.
2014-11-25  Jérôme BenoitImported Upstream version 0.9.0