subsurface crash when merging .xml files

[Linus Torvalds]

On Sun, Feb 19, 2017 at 2:29 PM, Linus Torvalds
<torvalds at linux-foundation.org> wrote:
>
> I've created a pull request for Dirk at
>
>     https://github.com/Subsurface-divelog/subsurface/pull/213

I just noticed that there was a special case I didn't handle right in
the dive site string merging. In the meantime Dirk already pulled my
original, so there's a new pull request for a trivial fixup at

    https://github.com/Subsurface-divelog/subsurface/pull/214

now.

             Linus