From: Bdale Garbee <bdale@gag.com>
Date: Thu, 16 Jul 2015 19:31:42 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.6
X-Git-Tag: 1.6.1~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;ds=sidebyside;h=6e9bb9178356620bd47d9f2e31abf42b7f1a8f11;hp=6e9bb9178356620bd47d9f2e31abf42b7f1a8f11;p=fw%2Faltos

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