From: foockinho <foockinho@lorea.org>
Date: Tue, 9 Oct 2012 16:41:45 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:lorea/n1_theme into call4desing
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ed24dcbb532d107bf763f3b6bf9e68b99bc0518a;p=lorea%2Fsaravea_theme.git

Merge branch 'master' of gitorious.org:lorea/n1_theme into call4desing

Conflicts:
	views/default/css/elements/icons.php
	views/default/css/elements/layout.php
	views/default/css/elements/navigation.php
---

ed24dcbb532d107bf763f3b6bf9e68b99bc0518a