Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Mon, 10 Jun 2013 09:51:36 +0000 (11:51 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Mon, 10 Jun 2013 09:51:36 +0000 (11:51 +0200)
commit6656b13932a99246b7e75af4ba2f0a137af1bfe1
treef3c6fe6339ba0c62f7f948abfcd10d764649aecd
parentaf7c18aea18be19b7227b25a019af4d257cee7dd
parent0d0f185fc8c502675579d440f0c351bf52fe5448
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan