Merge branch 'master' into rorcz
commit86d3f487b938890b64bb3e77932e3433d4ac0866
authorKyle J. McKay <mackyle@gmail.com>
Mon, 2 Feb 2015 07:50:22 +0000 (1 23:50 -0800)
committerKyle J. McKay <mackyle@gmail.com>
Mon, 2 Feb 2015 07:50:22 +0000 (1 23:50 -0800)
treeddac5417c2515191a42017810e2cd5c17fc1ae3f
parent8e07ed659793a08b855c50b857c80a24a515e7d0
parent8994eb8d7107b9aa46c446b2624d50780a571dd5
Merge branch 'master' into rorcz
Girocco/Config.pm
htaccess
jobd/update.sh
xinetd/git