merged fixes from RC_0_12 branch

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/