From: a bellenir <a@bellenir.com>
Date: Tue, 29 Jul 2014 21:03:09 +0000 (+0000)
Subject: Merge branch '88' into setmasterframe
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=5baa3dcdf6ffcb58ebe3114b4f27f499b11e832c;p=archive%2Fafm.git

Merge branch '88' into setmasterframe
---

5baa3dcdf6ffcb58ebe3114b4f27f499b11e832c