Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --cc doc/packages-list.txt
index f6d478a1950c43868949af07dec3b9f3511fff25,8fb00ea252c05669a7471db2cdc9be8ab278fdb3..061af4173deaea3ed97352f69b496b96dbf6a9fb
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -251,9 -251,9 +251,9 @@@
  * rp-pppoe-3.8
  * rrdtool-1.2.15
  * rssdler-0.4.0a
 -* rsync-2.6.9
 +* rsync-3.0.4
  * rtorrent-0.7.9
- * samba-3.2.5
+ * samba-3.2.6
  * sane-1.0.19
  * screen-4.0.3
  * sdparm-1.01