Merge branch 'fix/Ringbuffer' into edge
authorMichael Moon <triffid.hunter@gmail.com>
Thu, 26 Dec 2013 03:21:05 +0000 (14:21 +1100)
committerMichael Moon <triffid.hunter@gmail.com>
Thu, 26 Dec 2013 03:21:05 +0000 (14:21 +1100)

Trivial merge