Merge branch 'master' into rorcz
commit7998cc32d372d7ebe6a23d6bca5ec8b04431c358
authorKyle J. McKay <mackyle@gmail.com>
Fri, 31 May 2013 11:17:05 +0000 (31 04:17 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Fri, 31 May 2013 11:17:05 +0000 (31 04:17 -0700)
treea00b0c3f0a45aafb1786f838aafd12cda54a475d
parent3c121080f2edb2767153e9d30937d4eb9eb25b6a
parentb61a8eb036549ba9fd7b47a48ed57615cdbd2c69
Merge branch 'master' into rorcz
Girocco/Config.pm
cgi/regproj.cgi
gitweb/gitweb_config.perl