From: Lars Hjemli Date: Sat, 6 Dec 2008 10:37:37 +0000 (+0100) Subject: Merge branch 'full-log' X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/3c32fe07717f27fc891b66ccd06057fb810d03ad?hp=3c32fe07717f27fc891b66ccd06057fb810d03ad Merge branch 'full-log' Conflicts: cgit.c cgit.h ---