Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 26 Feb 2014 16:28:39 +0000 (17:28 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 26 Feb 2014 16:28:39 +0000 (17:28 +0100)
commitcd79d4fdae610d22cdd7886b88c3c4d888fd3cd0
tree77018597fac275cf321bc422a5e95f0cd3ecd56e
parentba5bd31c6e9b4b0b4b54659ea6a1147f62d9bf46
parentfc6f6e5efd7b66a7e39a2d9f1f42c3ae5e0ca282
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

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