From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Fri, 25 Oct 2013 17:22:40 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: 0.2-6~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a1334d41a53aec4a8bf2ebd7f3c67244eb8ac1a8;hp=a1334d41a53aec4a8bf2ebd7f3c67244eb8ac1a8;p=myslice.git

Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
	portal/sliceview.py
---