From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 17 Dec 2014 10:46:51 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~15^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=36a55939d5f370f1ff2b6021796e31edad21d1ff

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

Conflicts:
	myslice/settings.py
---

36a55939d5f370f1ff2b6021796e31edad21d1ff