bts-link git commit to 'master'

[Sandro Tosi]

 Makefile    |   13 ++++++++++++-
 btslink.cfg |    4 ++++
 changelog   |    4 ++++
 3 files changed, 20 insertions(+), 1 deletions(-)

New commits:
commit 8d14d0013cac15a5d7b44953e309524e5edaac5e
Merge: 5659420713aad4334b8ddd8eacfbb9d2b3778f49 42bfbef2ec4aa42fdc2127e55ac4941faf507ef6
Author: Sandro Tosi <morph at debian.org>
Date:   Fri Oct 16 07:30:21 2009 +0200

    merge conflict

commit 5659420713aad4334b8ddd8eacfbb9d2b3778f49
Author: Sandro Tosi <morph at debian.org>
Date:   Fri Oct 16 07:28:40 2009 +0200

    start using makefile to do operations (pull and merkel)

commit de2b29f97edaa62ffaf3d1f5806aff8690fd71ae
Author: Sandro Tosi <morph at debian.org>
Date:   Fri Oct 16 07:20:59 2009 +0200

    googlecode: fdupes