Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 22 Nov 2013 10:37:49 +0000 (11:37 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 22 Nov 2013 10:37:49 +0000 (11:37 +0100)
commitd1197c134b70bda643a752bdaf891190cb5a15e7
tree9b69f41376ee0580ae89728f9fac1da96826dad2
parent1295aaac83bf744acabf41920122837ea2b421d8
parent2ad7918b2828ff6352b057fcace93b74f7c4e0f1
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
manifold/manifoldapi.py
manifold/metadata.py
unfold/page.py