]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebbd219 17bcfe3)
Merge remote-tracking branch 'mfischer/libart' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Dec 2014 22:29:38 +0000 (23:29 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Dec 2014 22:29:38 +0000 (23:29 +0100)

Trivial merge
Peter's tree of IPFire 2.x