]> git.ozlabs.org Git - petitboot/commitdiff
Merge remote-tracking branch 'sammj/master'
authorJeremy Kerr <jk@ozlabs.org>
Tue, 14 Apr 2015 05:36:38 +0000 (15:36 +1000)
committerJeremy Kerr <jk@ozlabs.org>
Tue, 14 Apr 2015 05:36:38 +0000 (15:36 +1000)

Trivial merge