]> 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: d8b4c3f 893093d)
Merge remote-tracking branch 'stevee/image-magick'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 3 Nov 2011 23:00:01 +0000 (00:00 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 3 Nov 2011 23:00:01 +0000 (00:00 +0100)

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