Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 28 Feb 2014 18:55:49 +0000 (19:55 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 28 Feb 2014 18:55:49 +0000 (19:55 +0100)
commitcdf0d690da9e420339166b873ed2607cbca0e8a0
tree3d270731b33a2f89b43db43f2175bf35559b5056
parentd952e5a32d6fd2305bab65a9e8a6be66607c10df
parentc48236d2102eaabd62a346cf792430c340821d3e
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
rest/__init__.py
rest/__init__.py