]> 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: 962d2e0 25b458d)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 9 Dec 2011 19:05:19 +0000 (20:05 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 9 Dec 2011 19:05:19 +0000 (20:05 +0100)

Trivial merge
Stefan's tree of pakfire.