Merge remote-tracking branch 'origin/master'
[debian6500.git] / slave
2014-11-13  Laurent Mazetadd link for rec and slave