From: Thierry Parmentelat Date: Fri, 19 Nov 2010 16:05:29 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/plcapi X-Git-Tag: plcapi-5.0-19~48 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a7ba28837e8c6f949f29aff64a0297ac48cbe065;p=plcapi.git Merge branch 'master' of ssh://git.onelab.eu/git/plcapi --- a7ba28837e8c6f949f29aff64a0297ac48cbe065