Merge branch 'feature/on_second_tick_event' into edge
authorMichael Moon <triffid.hunter@gmail.com>
Tue, 15 Jan 2013 05:12:47 +0000 (16:12 +1100)
committerMichael Moon <triffid.hunter@gmail.com>
Tue, 15 Jan 2013 05:12:47 +0000 (16:12 +1100)

Trivial merge