Merge branch 'atomic-writes'
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 8 Sep 2014 16:28:05 +0000 (18:28 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 8 Sep 2014 16:28:05 +0000 (18:28 +0200)

Trivial merge