From: Luciano Montanaro <mikelima@cirulla.net>
Date: Sat, 4 Jan 2014 15:34:52 +0000 (+0100)
Subject: Merge branch 'feature-settings-page' into development
X-Git-Tag: 0.9.0~1
X-Git-Url: http://vcs.maemo.org/git/?p=quandoparte;a=commitdiff_plain;h=0236348990b50628602128cddcc0c356de29e0e5

Merge branch 'feature-settings-page' into development
---

0236348990b50628602128cddcc0c356de29e0e5