Merge branch 'master' into newnames
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 12 Nov 2013 14:35:01 +0000 (15:35 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 12 Nov 2013 14:35:01 +0000 (15:35 +0100)
commitf8a614d0271ddc3046e18d826df01f72a861257c
tree18168ae05e862494e8cd75d8b76873e562d312af
parent558f83af287568d57dfdd915f10fd36f071d940f
parent6d69d05d59181fa58cb00db2335256a373f794fd
Merge branch 'master' into newnames

Conflicts:
ui/topmenu.py
unfold/static/css/onelab_marko.css