mozilla-b2g/gaia — pull request #11792 by lodr (2013-08-27 18:03:23+00:00)
Title: Bug 906756 - Algorithms for merging givenName and familyName changed.

New tests added.
Adapt and merge changed to allow specifying the master contact.
Name composition centralized to avoid code repetition.