From: Joerg Jaspert Date: Sat, 21 Feb 2009 21:05:35 +0000 (+0100) Subject: Merge branch 'merge' X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b518daca5ef156c01c203843f3a4fbd2a630434;p=dak Merge branch 'merge' * merge: docstring move logic into a function more tidy ups for paths/variables use variables for paths allow p-a and p-u to take a directory to parse themselves --- 9b518daca5ef156c01c203843f3a4fbd2a630434