Merge branch 'requirejs-optimizer' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 3 May 2015 22:02:29 +0000 (00:02 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 3 May 2015 22:02:29 +0000 (00:02 +0200)

Trivial merge