From: Bdale Garbee <bdale@gag.com>
Date: Sun, 16 Aug 2015 15:53:40 +0000 (+0200)
Subject: Merge branch 'master' into branch-1.6
X-Git-Tag: 1.6.2~5
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=489d22f448d9927533e90da4d16c5a332a234a8d

Merge branch 'master' into branch-1.6
---

489d22f448d9927533e90da4d16c5a332a234a8d