]> 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: 620b252 70b263b)
Merge commit 'stevee/upstart' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 22 May 2010 21:31:50 +0000 (23:31 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 22 May 2010 21:31:50 +0000 (23:31 +0200)

Trivial merge
IPFire 3.x development tree