Merge commits and bluetoothd

[Thomas Zimmermann]

Hi,

Please be careful about not introducing merge commits into the history
of bluetoothd (or any other repository). Merge commits make it hard to
read and understand the commit history. There's no reason why pull
requests should contain merges. They should only happen when pull
requests are merged into the master branch.

I recently fixed up the commit history of bluetoothd's master branch
because of a merge commit in pull request #19. Now I saw that bug
1130271 reintroduced this commit line. Since bug 1130271 hasn't landed
yet, this was easy to fix this time.

If you create a branch for a bug, please make sure you are

- branching from an up-to-date master branch, not an old master or
v2.2; and
- your pull requests do not contain any merge commits.

If you have a pending pull request that has not been merged yet, please
make sure that

- it doesn't introduce the old merge commit of pull request 19 by
accident.

Thanks and best regards
Thomas