]> 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: 7072a3b b638612)
Merge remote-tracking branch 'stevee/dbus'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Jan 2012 11:28:20 +0000 (12:28 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Jan 2012 11:28:20 +0000 (12:28 +0100)

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