Merge branch 'master' into rorcz
commit16060f917c0d4d45f3986b0f732c51275afa8228
authorKyle J. McKay <mackyle@gmail.com>
Thu, 5 Mar 2015 04:38:30 +0000 (4 20:38 -0800)
committerKyle J. McKay <mackyle@gmail.com>
Thu, 5 Mar 2015 04:38:30 +0000 (4 20:38 -0800)
tree8e680c64f3830f10d27d2c0778852901ced6d487
parent461059ecf22d096d2908f4854176c7ce886547f0
parent76c9b091f02602b9da654c4bad8a3126c3abe79f
Merge branch 'master' into rorcz
Girocco/Config.pm
gitweb/gitweb_config.perl
jobd/update.sh
xinetd/git