From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Thu, 20 Mar 2014 06:42:23 +0000 (+0100)
Subject: Merge branch 'master', remote branch 'origin' into auto-maintenance
X-Git-Tag: v4.14.0~19
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=ba4bca945d08c2719ce49625d493e5760c28a528;p=brisk.git

Merge branch 'master', remote branch 'origin' into auto-maintenance
---

ba4bca945d08c2719ce49625d493e5760c28a528