merged fixes from RC_0_12 branch

ChangeLog

@@ -33,7 +33,6 @@ release 0.12
 	* Added support for uT peer exchange extension, implemented by Massaroddel.
 	* Modified the quota management to offer better bandwidth balancing
 	  between peers.
-	* added XCode project files (maintained by Gregor Riepl)
 	* logging now supports multiple sessions (different sessions now log
 	  to different directories).
 	* fixed random number generator seed problem, generating the same

Makefile.am

@@ -19,7 +19,35 @@ docs/ubuntu_build_notes.rst \
 docs/udp_tracker_protocol.html docs/client_test.rst docs/client_test.html \
 docs/unicode_support.png docs/client_test.png docs/style.css Jamfile project-root.jam \
 m4/ac_cxx_namespaces.m4 m4/acx_pthread.m4 m4/ax_boost_date-time.m4 \
-m4/ax_boost_filesystem.m4 m4/ax_boost_thread.m4 src/file_win.cpp libtorrent.pc
+m4/ax_boost_filesystem.m4 m4/ax_boost_thread.m4 src/file_win.cpp libtorrent.pc \
+bindings/README.txt \
+bindings/python/Jamfile \
+bindings/python/client.py \
+bindings/python/simple_client.py \
+bindings/python/src/alert.cpp \
+bindings/python/src/big_number.cpp \
+bindings/python/src/converters.cpp \
+bindings/python/src/datetime.cpp \
+bindings/python/src/docstrings.cpp \
+bindings/python/src/entry.cpp \
+bindings/python/src/extensions.cpp \
+bindings/python/src/filesystem.cpp \
+bindings/python/src/fingerprint.cpp \
+bindings/python/src/gil.hpp \
+bindings/python/src/module.cpp \
+bindings/python/src/optional.hpp \
+bindings/python/src/peer_info.cpp \
+bindings/python/src/peer_plugin.cpp \
+bindings/python/src/session.cpp \
+bindings/python/src/session_settings.cpp \
+bindings/python/src/torrent.cpp \
+bindings/python/src/torrent_handle.cpp \
+bindings/python/src/torrent_info.cpp \
+bindings/python/src/torrent_status.cpp \
+bindings/python/src/utility.cpp \
+bindings/python/src/version.cpp
+
+
 
 pkginclude_HEADER = \
 debian/changelog \

docs/projects.html

@@ -46,7 +46,7 @@ connects to the daemon. One GUI
 (ncurses) and one web interface
 (accessable through a web browser).
 Written by Michael Wojciechowski
-and Johan Stršm.</p>
+and Johan Ström.</p>
 </td>
 <td><img alt="btg_thumb.jpg" class="first last" src="btg_thumb.jpg" />
 </td>
@@ -83,6 +83,12 @@ client with a quite unique look.</p>
 <td><img alt="moopolice_thumb.gif" class="first last" src="moopolice_thumb.gif" />
 </td>
 </tr>
+<tr><td><p class="first"><strong>Linkage</strong></p>
+<p class="last"><a class="reference" href="http://code.google.com/p/linkage/">Linkage</a> is a gtkmm client that aims to be middle weight.</p>
+</td>
+<td><img alt="Linkage.jpg" class="first last" src="Linkage.jpg" />
+</td>
+</tr>
 <tr><td><p class="first"><strong>BitsCast</strong></p>
 <p class="last">RSS reader, podcast subscriber,
 video feed downloader, bittorrent

docs/projects.rst

@@ -56,6 +56,10 @@ project listed here, let me_ know.
 | MooPolice_ is a windows bittorrent                                            |                                     |
 | client with a quite unique look.                                              |                                     |
 +-------------------------------------------------------------------------------+-------------------------------------+
+| **Linkage**                                                                   | .. image:: Linkage.jpg              |
+|                                                                               |                                     |
+| Linkage_ is a gtkmm client that aims to be middle weight.                     |                                     |
++-------------------------------------------------------------------------------+-------------------------------------+
 | **BitsCast**                                                                  | .. image:: bitscast_thumb.png       |
 |                                                                               |                                     |
 | RSS reader, podcast subscriber,                                               |                                     |
@@ -130,6 +134,7 @@ project listed here, let me_ know.
 .. _Acquasition: http://www.acquisitionx.com
 .. _IM: http://www.im.com/
 .. _MooPolice: http://www.moopolice.de
+.. _Linkage: http://code.google.com/p/linkage/
 .. _BitsCast: http://www.bitscast.com/software/
 .. _Jamplayer: http://www.jamendo.com/en/static/jamendotools_jamplayer/
 .. _BitSlug: http://bitslug.sourceforge.net/

src/identify_client.cpp

@@ -155,6 +155,7 @@ namespace
 		, map_entry("ES", "electric sheep")
 		, map_entry("HL", "Halite")
 		, map_entry("KT", "KTorrent")
+		, map_entry("LK", "Linkage")
 		, map_entry("LP", "lphant")
 		, map_entry("LT", "libtorrent")
 		, map_entry("M",  "Mainline")