]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7fa57bb 0240357)
Merge remote branch 'stevee/upstart' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 25 Oct 2010 17:35:18 +0000 (19:35 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 25 Oct 2010 17:35:18 +0000 (19:35 +0200)

Trivial merge
IPFire 3.x development tree