Merge branch 'master' of git://git.onelab.eu/myslice
authorLoic Baron <loic.baron@lip6.fr>
Thu, 26 Sep 2013 10:10:16 +0000 (12:10 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 26 Sep 2013 10:10:16 +0000 (12:10 +0200)
commit4dfd873aec658a5f2a22983c7221f8b7006aa475
tree214abd91998907d8b07a8e4861f12313ff24a5d6
parentd0c1c4620fe021a2d54dec6c4519961dda867cce
parentabb43f86edd5a2888cb96ca92a58350db9e32fcf
Merge branch 'master' of git://git.onelab.eu/myslice

Conflicts:
portal/templates/registration_view.html
manifold/manifoldproxy.py
plugins/query_editor/__init__.py
plugins/query_editor/static/js/query_editor.js
portal/registrationview.py
portal/slicerequestview.py
portal/sliceview.py
portal/templates/registration_view.html
unfold/static/js/unfold-helper.js