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)
1  2 
manifold/manifoldapi.py
manifold/metadata.py
unfold/page.py

Simple merge
Simple merge
diff --cc unfold/page.py
Simple merge