]> git.ipfire.org Git - people/stevee/pakfire.git/commitdiff
projects / people / stevee / pakfire.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67d1ddb 361f134)
Merge branch 'master' of git://git.ipfire.org/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Oct 2011 18:50:01 +0000 (18:50 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Oct 2011 18:50:01 +0000 (18:50 +0000)

Trivial merge
Stefan's tree of pakfire.