Merge branch 'codesniff'
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 18 Dec 2014 21:42:36 +0000 (22:42 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 18 Dec 2014 21:42:36 +0000 (22:42 +0100)

Trivial merge