Merge remote-tracking branch 'local_master/master'
authorroot <root@devel.pl.sophia.inria.fr>
Wed, 18 Jul 2012 14:22:26 +0000 (16:22 +0200)
committerroot <root@devel.pl.sophia.inria.fr>
Wed, 18 Jul 2012 14:22:26 +0000 (16:22 +0200)
commit67e01f3db0ff9ede48bcf8463af4afeb14b81312
tree2ebafa99fa092176387ee7e9448bfbf7a0ca0a69
parent5672d5f4d79054e274005b0dbe930bd348e6cf47
parent3311c79618b243c1a709c428688f6af5e306c774
Merge remote-tracking branch 'local_master/master'