# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1519312033 -28800
# Node ID a55a6901a181d0b68a444126d5603c3776f57c80
# Parent  2e9b6d9c7e7d55e4a86e7ffd1345a73ed9bd484d# Parent  b918ad1c5b256e4cf3e4b6a98e4c104a1fe69db7
Merge branch 'stellarpower-master'