Merge branch 'nk/maint-gitweb-log-by-lines'