From: Jordan Augé <jordan.auge@lip6.fr>
Date: Wed, 27 Nov 2013 08:32:58 +0000 (+0100)
Subject: Merge branch 'master' into scheduler
X-Git-Tag: myslice-0.3-0~107
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=8be9b358a544e1ea9e53ad40495fa42e9d5edf9a;p=myslice.git

Merge branch 'master' into scheduler
---

8be9b358a544e1ea9e53ad40495fa42e9d5edf9a