]> Chaos Git - corbenik/corbenik.git/commitdiff
Merge branch 'master' into resize
authorchaoskagami <chaos.kagami@gmail.com>
Thu, 9 Jun 2016 21:14:28 +0000 (17:14 -0400)
committerchaoskagami <chaos.kagami@gmail.com>
Thu, 9 Jun 2016 21:14:28 +0000 (17:14 -0400)

Trivial merge