]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ecf97bd 71c7c48)
Merge remote-tracking branch 'trikolon/next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 Feb 2013 13:32:30 +0000 (14:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 Feb 2013 13:32:30 +0000 (14:32 +0100)

Trivial merge
IPFire 2.x development tree