From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Sep 2011 01:01:01 +0000 (-0700)
Subject: Properly merge dive buddies and divemaster information
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;ds=sidebyside;h=50c2bb7c71b279237f05c1c0a530d494bad534c8;hp=50c2bb7c71b279237f05c1c0a530d494bad534c8;p=ext%2Fsubsurface.git

Properly merge dive buddies and divemaster information

When we merge dives, we didn't merge these fields properly. Do it.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---