Merge branch 'logbuffix'
authorSteve Youngs <steve@emchat.org>
Sun, 15 May 2011 06:02:20 +0000 (16:02 +1000)
committerSteve Youngs <steve@emchat.org>
Sun, 15 May 2011 06:02:20 +0000 (16:02 +1000)

Trivial merge