From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 14 Apr 2015 05:36:38 +0000 (+1000)
Subject: Merge remote-tracking branch 'sammj/master'
X-Git-Tag: v1.0.0~79
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;ds=sidebyside;h=a240e296ac2ecf8934f71cb23946fc77101cdfd6;hp=a240e296ac2ecf8934f71cb23946fc77101cdfd6;p=petitboot

Merge remote-tracking branch 'sammj/master'
---