]> 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: 166a265 876fe70)
Merge branch 'batman'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 5 Dec 2014 00:44:04 +0000 (01:44 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 5 Dec 2014 00:44:04 +0000 (01:44 +0100)

Trivial merge
IPFire 3.x development tree