From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 29 Dec 2014 09:53:03 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.2~1^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=7464fb5c0d4d4857963b52b944b27df41e4ec1f6

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
	rest/credentials.py
---

7464fb5c0d4d4857963b52b944b27df41e4ec1f6