Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 29 Dec 2014 09:53:03 +0000 (10:53 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 29 Dec 2014 09:53:03 +0000 (10:53 +0100)
commit7464fb5c0d4d4857963b52b944b27df41e4ec1f6
treed3a05d87fa6a7c0408e5df05ae7e160247a50c00
parent0e1e84913624e7eb05987c54db86d8eb8cf02d63
parentd559cf89ba2946f22bba8a681ed60ffb66e32cf1
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
rest/credentials.py