Merge branch master into rorcz
commit73cb8a56b81e25b2af971956d164260f605fa49c
authorKyle J. McKay <mackyle@gmail.com>
Wed, 7 Oct 2015 17:58:46 +0000 (7 10:58 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Wed, 7 Oct 2015 17:58:46 +0000 (7 10:58 -0700)
tree8896eba2e3b96c5203c99121ed36854608ffe317
parent9d418d16af58469398378c26dd00d87e6e6352b0
parent0214e1e10d5e11ad2d6d96cd13cc3a9e77dbcda1
Merge branch master into rorcz
cgi/htaccess
jobd/update.sh