Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
authorNicolas Turro <nturro@sfa.grenoble.senslab.info>
Thu, 20 Oct 2011 15:19:31 +0000 (17:19 +0200)
committerNicolas Turro <nturro@sfa.grenoble.senslab.info>
Thu, 20 Oct 2011 15:19:31 +0000 (17:19 +0200)
commit01e6e73cb60a777253bf4131692d29b2f0b9d9e3
tree9f0f7929e71e2b2aeff9bb3ad8db4ac05cd43b6f
parent786df930f6fd46ce574d427073859fcda325884b
parent9b532d718fcedbc92d3eba4b59d519154e835884
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2