Merge branch 'jordan' of git://git.onelab.eu/myslice into jordan
authorLoic Baron <loic.baron@lip6.fr>
Wed, 21 Aug 2013 11:08:00 +0000 (13:08 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 21 Aug 2013 11:08:00 +0000 (13:08 +0200)
commit33438ecdb2c04d0a861ddbbd26f8ac6bde8e4583
tree1ffd94f639e09c16886603019042eff7cbe2ce41
parent8476d7d432f712af498211268c0dbd2a26170301
parent24365474e92552fb38c74c38e70d6776d84cdd18
Merge branch 'jordan' of git://git.onelab.eu/myslice into jordan