I took the liberty to reindent the backing out of gupnp in the changelog to show that it wasn't part of the merge - other than that: good work!
I took the liberty to reindent the backing out of gupnp in the changelog to show that it wasn't part of the merge - other than that: good work!