Merge branch 'master' into cli
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 7 Jan 2013 21:29:09 +0000 (22:29 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 7 Jan 2013 21:29:09 +0000 (22:29 +0100)

Trivial merge