]> Chaos Git - corbenik/corbenik.git/commitdiff
Merge branch 'master' into wip/plainconf
authorchaoskagami <chaos.kagami@gmail.com>
Sat, 15 Oct 2016 07:20:40 +0000 (03:20 -0400)
committerchaoskagami <chaos.kagami@gmail.com>
Sat, 15 Oct 2016 07:20:40 +0000 (03:20 -0400)

Trivial merge