Merge branch 'feature/cleanup-clock-init' into edge
authorMichael Moon <triffid.hunter@gmail.com>
Mon, 21 Oct 2013 02:10:17 +0000 (13:10 +1100)
committerMichael Moon <triffid.hunter@gmail.com>
Mon, 21 Oct 2013 02:10:17 +0000 (13:10 +1100)

Trivial merge