]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22d1277 0a5f8b5)
Merge remote-tracking branch 'ummeegge/cairo-update'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Oct 2012 13:08:32 +0000 (15:08 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Oct 2012 13:08:32 +0000 (15:08 +0200)

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