Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Thu, 24 Oct 2013 23:58:01 +0000 (01:58 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 24 Oct 2013 23:58:01 +0000 (01:58 +0200)
1  2 
portal/sliceview.py
unfold/page.py

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