]> 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: 25378ca ea1d102)
Merge remote-tracking branch 'origin/thirteen' into thirteen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 28 Aug 2012 18:21:41 +0000 (20:21 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 28 Aug 2012 18:21:41 +0000 (20:21 +0200)

Trivial merge
IPFire 2.x development tree