]> 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: 60c7a32 74ffafe)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 24 Jun 2013 21:25:13 +0000 (21:25 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 24 Jun 2013 21:25:13 +0000 (21:25 +0000)

Trivial merge
Stefan's tree of pakfire.