]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commitdiff
projects / people / arne_f / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c340d0b e3f34de)
Merge remote-tracking branch 'maniacikarus/pango'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Apr 2011 19:14:13 +0000 (21:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Apr 2011 19:14:13 +0000 (21:14 +0200)

Trivial merge
Arne's tree of IPFire 3.x.